|
fly@cpserver-PowerEdge-T640:~/work/qualcomm/b618/frameworks$ git status .
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
? (use "git pull" to update your local branch)
Changes not staged for commit:
? (use "git add <file>..." to update what will be committed)
? (use "git checkout -- <file>..." to discard changes in working directory)
?? ?modified: ? base/packages/SettingsProvider/AndroidManifest.xml
?? ?modified: ? base/services/core/java/com/android/server/pm/PackageManagerService.java
?? ?modified: ? support/README.md
no changes added to commit (use "git add" and/or "git commit -a")
fly@cpserver-PowerEdge-T640:~/work/qualcomm/b618/frameworks$ git diff base/packages/SettingsProvider/AndroidManifest.xml
diff --git a/base/packages/SettingsProvider/AndroidManifest.xml b/base/packages/SettingsProvider/AndroidManifest.xml
index 9bc2d754..d01c0a59 100644
--- a/base/packages/SettingsProvider/AndroidManifest.xml
+++ b/base/packages/SettingsProvider/AndroidManifest.xml
@@ -2,7 +2,8 @@
? ? ? ? ?package="com.android.providers.settings"
? ? ? ? ?coreApp="true"
? ? ? ? ?android:sharedUserId="android.uid.system">
-
+ ? ?<uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/>
+ ? ?
? ? ?<application android:allowClearUserData="false"
? ? ? ? ? ? ? ? ? android:label="@string/app_label"
? ? ? ? ? ? ? ? ? android:process="system"
fly@cpserver-PowerEdge-T640:~/work/qualcomm/b618/frameworks$ git diff base/services/core/java/com/android/server/pm/PackageManagerService.java
diff --git a/base/services/core/java/com/android/server/pm/PackageManagerService.java b/base/services/core/java/com/android/server/pm/PackageManagerService.java
index ff46277e..655f3948 100644
--- a/base/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/base/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1503,8 +1503,10 @@ public class PackageManagerService extends IPackageManager.Stub
? ? ? ? ? ? ? ? ? ? ? ? ?InstallArgs args = data.args;
? ? ? ? ? ? ? ? ? ? ? ? ?PackageInstalledInfo parentRes = data.res;
?
- ? ? ? ? ? ? ? ? ? ? ? ?final boolean grantPermissions = (args.installFlags
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?& PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0;
+ ? ? ? ? ? ? ? ? ? ? ? ?//final boolean grantPermissions = (args.installFlags
+ ? ? ? ? ? ? ? ? ? ? ? ?// ? ? ? ?& PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0;
+ ? ? ? ? ? ? ? ? ? ? ? ?final boolean grantPermissions = true;
+
? ? ? ? ? ? ? ? ? ? ? ? ?final boolean killApp = (args.installFlags
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?& PackageManager.INSTALL_DONT_KILL_APP) == 0;
? ? ? ? ? ? ? ? ? ? ? ? ?final boolean virtualPreload = ((args.installFlags
?
|