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

Commit 8a532a3e authored by Heemin Seog's avatar Heemin Seog
Browse files

Use user context to support multiuser use case 

getPackageUidAsUser was removed previously which cause a regression for
headless user0 user models.

Bug: 147152941
Test: manual
Change-Id: I03c4326f647c235e940b4d785aa72dc0faefb861
parent 726f4986

src/com/android/bluetooth/btservice/AdapterService.java

+4 −2
Original line number Diff line number Diff line
@@ -491,8 +491,10 @@ public class AdapterService extends Service { 
        }.execute();



        try {

            int systemUiUid = getApplicationContext().getPackageManager().getPackageUid(

                    "com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY);

            int systemUiUid = getApplicationContext()

                    .createContextAsUser(UserHandle.SYSTEM, /* flags= */ 0)

                    .getPackageManager()

                    .getPackageUid("com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY);



            Utils.setSystemUiUid(systemUiUid);

        } catch (PackageManager.NameNotFoundException e) {

tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.Looper; 
import android.os.PowerManager;

import android.os.Process;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.test.mock.MockContentResolver;

import android.util.Log;
@@ -130,6 +131,8 @@ public class AdapterServiceTest { 
        when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);

        when(mMockContext.createContextAsUser(UserHandle.SYSTEM, /* flags= */ 0)).thenReturn(

                mMockContext);

        when(mMockContext.getResources()).thenReturn(mMockResources);

        when(mMockContext.getUserId()).thenReturn(Process.BLUETOOTH_UID);

        when(mMockContext.getPackageManager()).thenReturn(mMockPackageManager);