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

Commit f65c1e01 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Removed the flag hsum_package_manager" into main

parents d8208540 1d91bbc3

flags/misc.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -101,17 +101,6 @@ flag { 
    }

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "hsum_package_manager"

    namespace: "telephony"

    description: "Fixed the bug that package manager is not for the right user"

    bug:"356827794"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=jackyu TARGET=25Q2

flag {

    name: "power_down_race_fix"

src/java/com/android/internal/telephony/InboundSmsHandler.java

+1 −4
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import com.android.internal.telephony.SmsConstants.MessageClass; 
import com.android.internal.telephony.analytics.TelephonyAnalytics;

import com.android.internal.telephony.analytics.TelephonyAnalytics.SmsMmsAnalytics;

import com.android.internal.telephony.flags.FeatureFlags;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.satellite.SatelliteController;

import com.android.internal.telephony.satellite.metrics.CarrierRoamingSatelliteSessionStats;
@@ -2192,9 +2191,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                UserManager userManager =

                        (UserManager) context.getSystemService(Context.USER_SERVICE);

                PackageManager pm = context.getPackageManager();

                if (Flags.hsumPackageManager()) {

                pm = context.createContextAsUser(UserHandle.CURRENT, 0).getPackageManager();

                }

                if (userManager.isUserUnlocked()) {

                    context.startActivityAsUser(pm.getLaunchIntentForPackage(

                            Telephony.Sms.getDefaultSmsPackage(context)), UserHandle.CURRENT);

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+4 −9
Original line number Diff line number Diff line
@@ -838,17 +838,12 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
     */

    @Nullable

    private String getCurrentPackageName() {

        if (mFeatureFlags.hsumPackageManager()) {

        PackageManager pm = mContext.createContextAsUser(Binder.getCallingUserHandle(), 0)

                .getPackageManager();

        if (pm == null) return null;

        String[] callingPackageNames = pm.getPackagesForUid(Binder.getCallingUid());

        return (callingPackageNames == null) ? null : callingPackageNames[0];

    }

        if (mPackageManager == null) return null;

        String[] callingPackageNames = mPackageManager.getPackagesForUid(Binder.getCallingUid());

        return (callingPackageNames == null) ? null : callingPackageNames[0];

    }



    /**

     * Make sure the device has required telephony feature

src/java/com/android/internal/telephony/SmsController.java

+5 −8
Original line number Diff line number Diff line
@@ -226,15 +226,12 @@ public class SmsController extends ISmsImplBase { 


    @NonNull

    private String getCallingPackage() {

        if (mFlags.hsumPackageManager()) {

        PackageManager pm = mContext.createContextAsUser(Binder.getCallingUserHandle(), 0)

                .getPackageManager();

        String[] packages = pm.getPackagesForUid(Binder.getCallingUid());

        if (packages == null || packages.length == 0) return "";

        return packages[0];

    }

        return mContext.getPackageManager().getPackagesForUid(Binder.getCallingUid())[0];

    }



    @Override

    public void sendTextForSubscriber(int subId, String callingPackage,

src/java/com/android/internal/telephony/euicc/EuiccController.java

+1 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.euicc.EuiccConnector.OtaStatusChangedCallback;

import com.android.internal.telephony.flags.FeatureFlags;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.subscription.SubscriptionManagerService;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.UiccController;
@@ -2420,7 +2419,7 @@ public class EuiccController extends IEuiccController.Stub { 
    }



    private boolean canManageSubscription(SubscriptionInfo subInfo, String packageName) {

        if (Flags.hsumPackageManager() && UserManager.isHeadlessSystemUserMode()) {

        if (UserManager.isHeadlessSystemUserMode()) {

            return mSubscriptionManager.canManageSubscriptionAsUser(subInfo, packageName,

                    UserHandle.of(ActivityManager.getCurrentUser()));

        } else {