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

Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85 am: 60a3d7d01d am: 757e453581 am: b36ae16050

Browse Source 
Change-Id: I9a12c9fc23aa98834c4ec2d76711b592958c06d3
This commit is contained in:
Edgar Wang
2020-05-28 08:06:01 +00:00
committed by Automerger Merge Worker
parent d5fcd5e68e b36ae16050
commit a457244cd1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -288,7 +288,7 @@ public class DeviceAdminAdd extends Activity {
// setup.
final String supervisor = getString(
com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
if (supervisor == null) {
if (TextUtils.isEmpty(supervisor)) {
Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
+ "profile owner defined");
finish();
@@ -297,7 +297,7 @@ public class DeviceAdminAdd extends Activity {
final ComponentName supervisorComponent = ComponentName.unflattenFromString(
supervisor);
if (who.compareTo(supervisorComponent) != 0) {
if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
finish();
return;