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

Commit 4f7fa231 authored by Bill Yi's avatar Bill Yi
Browse files

Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE 

Merged-In: I0ff9ff4992dc17879d3cc67ebf3113bee47c1cf9
Change-Id: I46eb801f7b622cc34e117df8e30e6bba0838a93c
parents 8271ee4d 83b9d243

src/com/android/server/telecom/TelecomServiceImpl.java

+17 −0
Original line number Diff line number Diff line
@@ -279,6 +279,23 @@ public class TelecomServiceImpl { 


        @Override

        public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {

            //TODO: Deprecate this in S

            try {

                enforceCallingPackage(packageName);

            } catch (SecurityException se1) {

                EventLog.writeEvent(0x534e4554, "153995334", Binder.getCallingUid(),

                        "getPhoneAccountsForPackage: invalid calling package");

                throw se1;

            }



            try {

                enforcePermission(READ_PRIVILEGED_PHONE_STATE);

            } catch (SecurityException se2) {

                EventLog.writeEvent(0x534e4554, "153995334", Binder.getCallingUid(),

                        "getPhoneAccountsForPackage: no permission");

                throw se2;

            }



            synchronized (mLock) {

                final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                long token = Binder.clearCallingIdentity();

src/com/android/server/telecom/TtyManager.java

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ final class TtyManager implements WiredHeadsetManager.Listener { 


        IntentFilter intentFilter = new IntentFilter(

                TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);

        mContext.registerReceiver(mReceiver, intentFilter);

        mContext.registerReceiver(mReceiver, intentFilter,

                android.Manifest.permission.MODIFY_PHONE_STATE,

                null);



        updateCurrentTtyMode();

    }