Merge "Revert "Check permissions only against packagesettings"" into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)
diff --cc core/java/android/content/pm/PackageManagerInternal.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)
		1	2
core/java/android/content/pm/PackageManagerInternal.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history