PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow PackageManager refactoring."

Browse Source
This commit is contained in:
Jeff Sharkey
2016-01-06 22:26:15 +00:00
committed by Android (Google) Code Review
parent 7e78bedb67 df828405b1
commit c24d360328
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DataUsageSummary.java
View File

@@ -480,7 +480,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
return;
}
try {
int uid = getActivity().getPackageManager().getPackageUid(mShowAppImmediatePkg,
int uid = getActivity().getPackageManager().getPackageUidAsUser(mShowAppImmediatePkg,
UserHandle.myUserId());
AppItem app = new AppItem(uid);
app.addUid(uid);

4
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -341,7 +341,7 @@ public class DeviceAdminSettings extends ListFragment {
private void addDeviceAdminBroadcastReceiversForProfile(
Collection<ComponentName> alreadyAddedComponents, final int profileId) {
final PackageManager pm = getActivity().getPackageManager();
List<ResolveInfo> enabledForProfile = pm.queryBroadcastReceivers(
List<ResolveInfo> enabledForProfile = pm.queryBroadcastReceiversAsUser(
new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
profileId);
@@ -383,7 +383,7 @@ public class DeviceAdminSettings extends ListFragment {
final int n = activeAdmins.size();
for (int i = 0; i < n; ++i) {
ComponentName activeAdmin = activeAdmins.get(i);
List<ResolveInfo> resolved = packageManager.queryBroadcastReceivers(
List<ResolveInfo> resolved = packageManager.queryBroadcastReceiversAsUser(
new Intent().setComponent(activeAdmin), PackageManager.GET_META_DATA
| PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, profileId);
if (resolved != null) {

8
src/com/android/settings/applications/AppLaunchSettings.java
View File

@@ -139,7 +139,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
// Present 'undefined' as 'ask' because the OS treats them identically for
// purposes of the UI (and does the right thing around pending domain
// verifications that might arrive after the user chooses 'ask' in this UI).
final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
final int state = mPm.getIntentVerificationStatusAsUser(mPackageName, UserHandle.myUserId());
mAppLinkState.setValue(
Integer.toString((state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
@@ -164,16 +164,16 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
}
final int userId = UserHandle.myUserId();
final int priorState = mPm.getIntentVerificationStatus(mPackageName, userId);
final int priorState = mPm.getIntentVerificationStatusAsUser(mPackageName, userId);
if (priorState == newState) {
return false;
}
boolean success = mPm.updateIntentVerificationStatus(mPackageName, newState, userId);
boolean success = mPm.updateIntentVerificationStatusAsUser(mPackageName, newState, userId);
if (success) {
// Read back the state to see if the change worked
final int updatedState = mPm.getIntentVerificationStatus(mPackageName, userId);
final int updatedState = mPm.getIntentVerificationStatusAsUser(mPackageName, userId);
success = (newState == updatedState);
} else {
Log.e(TAG, "Couldn't update intent verification status!");

4
src/com/android/settings/applications/ClearDefaultsPreference.java
View File

@@ -95,7 +95,7 @@ public class ClearDefaultsPreference extends Preference {
final int userId = UserHandle.myUserId();
mPm.clearPackagePreferredActivities(mPackageName);
if (isDefaultBrowser(mPackageName)) {
mPm.setDefaultBrowserPackageName(null, userId);
mPm.setDefaultBrowserPackageNameAsUser(null, userId);
}
try {
mUsbManager.clearDefaults(mPackageName, userId);
@@ -163,7 +163,7 @@ public class ClearDefaultsPreference extends Preference {
}
private boolean isDefaultBrowser(String packageName) {
final String defaultBrowser = mPm.getDefaultBrowserPackageName(UserHandle.myUserId());
final String defaultBrowser = mPm.getDefaultBrowserPackageNameAsUser(UserHandle.myUserId());
return packageName.equals(defaultBrowser);
}

2
src/com/android/settings/applications/ManageApplications.java
View File

@@ -1097,7 +1097,7 @@ public class ManageApplications extends InstrumentedFragment
private CharSequence getDomainsSummary(String packageName) {
// If the user has explicitly said "no" for this package, that's the
// string we should show.
int domainStatus = mPm.getIntentVerificationStatus(packageName, UserHandle.myUserId());
int domainStatus = mPm.getIntentVerificationStatusAsUser(packageName, UserHandle.myUserId());
if (domainStatus == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) {
return mContext.getString(R.string.domain_urls_summary_none);
}

4
src/com/android/settings/applications/ManageDefaultApps.java
View File

@@ -98,7 +98,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
final PackageManager pm = getPackageManager();
String packageName = pm.getDefaultBrowserPackageName(UserHandle.myUserId());
String packageName = pm.getDefaultBrowserPackageNameAsUser(UserHandle.myUserId());
if (!TextUtils.isEmpty(packageName)) {
// Check if the default Browser package is still there
Intent intent = new Intent();
@@ -142,7 +142,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
if (TextUtils.isEmpty(packageName)) {
return false;
}
boolean result = mPm.setDefaultBrowserPackageName(
boolean result = mPm.setDefaultBrowserPackageNameAsUser(
packageName.toString(), myUserId);
if (result) {
mDefaultBrowserPreference.setValue(packageName.toString());

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -990,7 +990,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (deviceOwner != null) {
final int deviceOwnerUserId = dpm.getDeviceOwnerUserId();
try {
final int deviceOwnerUid = pm.getPackageUid(deviceOwner.getPackageName(),
final int deviceOwnerUid = pm.getPackageUidAsUser(deviceOwner.getPackageName(),
deviceOwnerUserId);
isConfigEligibleForLockdown = deviceOwnerUid == config.creatorUid;
} catch (NameNotFoundException e) {