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

Commit 40021596 authored by Grace Jia's avatar Grace Jia
Browse files

Copy hidden API from Telephony.ServiceStateTable to 

ServiceStateProvider.

Test: compile
Bug: 147902780
Change-Id: Ic5be695850b43442b950a197fd4bbd28b9c5f8b0
parent 5cfd8480

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

+29 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import static android.provider.Telephony.ServiceStateTable.getContentValuesForServiceState;

import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;



import static com.android.internal.telephony.CarrierActionAgent.CARRIER_ACTION_SET_RADIO_ENABLED;
@@ -33,6 +32,7 @@ import android.app.PendingIntent; 
import android.compat.annotation.UnsupportedAppUsage;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -44,6 +44,7 @@ import android.os.AsyncResult; 
import android.os.BaseBundle;

import android.os.Handler;

import android.os.Message;

import android.os.Parcel;

import android.os.PersistableBundle;

import android.os.Registrant;

import android.os.RegistrantList;
@@ -281,6 +282,15 @@ public class ServiceStateTracker extends Handler { 
    protected static final int EVENT_CELL_LOCATION_RESPONSE            = 56;

    protected static final int EVENT_CARRIER_CONFIG_CHANGED            = 57;



    /**

     * The current service state.

     *

     * This is a column name in {@link android.provider.Telephony.ServiceStateTable}.

     *

     * Copied from packages/services/Telephony/src/com/android/phone/ServiceStateProvider.java

     */

    private static final String SERVICE_STATE = "service_state";



    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"CARRIER_NAME_DISPLAY_BITMASK"},

            value = {CARRIER_NAME_DISPLAY_BITMASK_SHOW_PLMN,
@@ -5660,4 +5670,22 @@ public class ServiceStateTracker extends Handler { 
                Context.TELEPHONY_SERVICE);

        tm.setDataNetworkTypeForPhone(mPhone.getPhoneId(), type);

    }



    /**

     * Used to insert a ServiceState into the ServiceStateProvider as a ContentValues instance.

     *

     * Copied from packages/services/Telephony/src/com/android/phone/ServiceStateProvider.java

     *

     * @param state the ServiceState to convert into ContentValues

     * @return the convertedContentValues instance

     */

    private ContentValues getContentValuesForServiceState(ServiceState state) {

        ContentValues values = new ContentValues();

        final Parcel p = Parcel.obtain();

        state.writeToParcel(p, 0);

        // Turn the parcel to byte array. Safe to do this because the content values were never

        // written into a persistent storage. ServiceStateProvider keeps values in the memory.

        values.put(SERVICE_STATE, p.marshall());

        return values;

    }

}