Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c680bd66 authored by Eduard Dumitrescul's avatar Eduard Dumitrescul Committed by Android (Google) Code Review
Browse files

Merge "Remove flag" into main

parents 1464113b 84264172

core/java/android/app/admin/flags/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -529,16 +529,6 @@ flag { 
  bug: "435271558"

}



flag {

  name: "fix_hsum_bugreport_share_crash"

  namespace: "enterprise"

  description: "[HSUM][Framework Bug][DO] TestDPC crashes when sharing a bugreport requested from TestDPC"

  bug: "341879351"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "multi_user_management_device_provisioning"

  is_exported: true

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −7
Original line number Diff line number Diff line
@@ -9581,15 +9581,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        synchronized (getLockObject()) {

            final Intent intent = new Intent(DeviceAdminReceiver.ACTION_BUGREPORT_SHARE);

            final int deviceOwnerUserId = mOwners.getDeviceOwnerUserId();

            final Uri bugreportUriForUser;













            if (Flags.fixHsumBugreportShareCrash()) {















            // Bugreports are collected by the shell, which runs as UserHandle.USER_SYSTEM.













                bugreportUriForUser = ContentProvider.createContentUriForUser(













            final Uri bugreportUriForUser = ContentProvider.createContentUriForUser(















                        bugreportUri, UserHandle.of(UserHandle.USER_SYSTEM));













            } else {













                bugreportUriForUser = bugreportUri;













            }





























            intent.setComponent(mOwners.getDeviceOwnerComponent());















            intent.setDataAndType(bugreportUriForUser, RemoteBugreportManager.BUGREPORT_MIMETYPE);