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

Commit 829204b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed java.lang.NoClassDefFoundError"

parents a933e6cc 1275e236

jarjar-rules-shared.txt

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ rule com.android.internal.util.FastXmlSerializer* com.android.internal.telephony 
rule com.android.internal.util.HexDump* com.android.internal.telephony.HexDump@1

rule com.android.internal.util.IState* com.android.internal.telephony.IState@1

rule com.android.internal.util.IndentingPrintWriter* com.android.internal.telephony.IndentingPrintWriter@1

rule com.android.internal.util.Preconditions* com.android.internal.telephony.Preconditions@1

rule com.android.internal.util.State* com.android.internal.telephony.State@1

rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1

rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1

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

+5 −4
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ import android.util.Base64; 
import android.util.Log;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;



import java.security.SecureRandom;

import java.util.Iterator;

import java.util.Map;

import java.util.Objects;

import java.util.concurrent.TimeUnit;
@@ -116,9 +116,10 @@ public class AppSmsManager { 
            @NonNull String callingPackageName,

            @Nullable String prefixes,

            @NonNull PendingIntent intent) {

        Preconditions.checkStringNotEmpty(callingPackageName,

                "callingPackageName cannot be null or empty.");

        Preconditions.checkNotNull(intent, "intent cannot be null");

        if (TextUtils.isEmpty(callingPackageName)) {

            throw new IllegalArgumentException("callingPackageName cannot be null or empty.");

        }

        Objects.requireNonNull(intent, "intent cannot be null");

        // Check calling uid matches callingpkg.

        AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);

        appOps.checkPackage(Binder.getCallingUid(), callingPackageName);

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

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.internal.telephony;



import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -95,6 +94,7 @@ import java.util.Arrays; 
import java.util.HashSet;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.atomic.AtomicBoolean;
@@ -4376,7 +4376,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    public void setAllowedCarriers(CarrierRestrictionRules carrierRestrictionRules,

            Message result, WorkSource workSource) {

        checkNotNull(carrierRestrictionRules, "Carrier restriction cannot be null.");

        Objects.requireNonNull(carrierRestrictionRules, "Carrier restriction cannot be null.");



        RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class, result);

        if (!simProxy.isEmpty()) {
@@ -4530,7 +4530,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,

            Message result) {

        checkNotNull(imsiEncryptionInfo, "ImsiEncryptionInfo cannot be null.");

        Objects.requireNonNull(imsiEncryptionInfo, "ImsiEncryptionInfo cannot be null.");

        RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class, result);

        if (simProxy.isEmpty()) return;

        if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {
@@ -4560,7 +4560,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    public void startNattKeepalive(int contextId, KeepalivePacketData packetData,

            int intervalMillis, Message result) {

        checkNotNull(packetData, "KeepaliveRequest cannot be null.");

        Objects.requireNonNull(packetData, "KeepaliveRequest cannot be null.");

        RadioDataProxy dataProxy = getRadioServiceProxy(RadioDataProxy.class, result);

        if (dataProxy.isEmpty()) return;

        if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {