Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Watch out for null pointers when getting profile owner info"

Browse Source
This commit is contained in:
Rubin Xu
2016-01-29 16:38:30 +00:00
committed by Android (Google) Code Review
parent 8b0dfef9fe 945fd0074a
commit a3b0c04f34
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/com/android/internal/app/UnlaunchableAppActivity.java
View File

@@ -32,6 +32,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -69,12 +70,11 @@ public class UnlaunchableAppActivity extends Activity
}
String dialogTitle;
String dialogMessage;
String dialogMessage = null;
if (mReason == UNLAUNCHABLE_REASON_QUIET_MODE) {
dialogTitle = getResources().getString(R.string.work_mode_off_title);
dialogMessage = getResources().getString(R.string.work_mode_off_message);
} else if (mReason == UNLAUNCHABLE_REASON_SUSPENDED_PACKAGE) {
PackageManager pm = getPackageManager();
DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
Context.DEVICE_POLICY_SERVICE);
String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
@@ -91,12 +91,19 @@ public class UnlaunchableAppActivity extends Activity
}
dialogTitle = String.format(getResources().getString(R.string.suspended_package_title),
packageLabel);
dialogMessage = dpm.getShortSupportMessageForUser(dpm.getProfileOwnerAsUser(mUserId),
mUserId);
if (dialogMessage == null) {
dialogMessage = String.format(
getResources().getString(R.string.suspended_package_message),
dpm.getProfileOwnerNameAsUser(mUserId));
ComponentName profileOwner = dpm.getProfileOwnerAsUser(mUserId);
String profileOwnerName = null;
if (profileOwner != null) {
dialogMessage = dpm.getShortSupportMessageForUser(profileOwner, mUserId);
profileOwnerName = dpm.getProfileOwnerNameAsUser(mUserId);
}
// Fall back to standard message if profile owner hasn't set something specific.
if (TextUtils.isEmpty(dialogMessage)) {
if (TextUtils.isEmpty(profileOwnerName)) {
profileOwnerName = getResources().getString(R.string.unknownName);
}
dialogMessage = getResources().getString(R.string.suspended_package_message,
profileOwnerName);
}
} else {
Log.wtf(TAG, "Invalid unlaunchable type: " + mReason);