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

Commit dc945624 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576



Change-Id: Ie6c234d7fe9be2bd2428180430b572cfaee4372f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12f9cef4 54f39ec2

src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java

+17 −3
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package com.android.settings.fuelgauge.batterytip; 


import android.annotation.Nullable;

import android.content.Context;

import android.os.BadParcelableException;

import android.os.Bundle;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;
@@ -142,14 +144,26 @@ public class BatteryTipPreferenceController extends BasePreferenceController { 
    }



    public void restoreInstanceState(Bundle bundle) {

        if (bundle != null) {

        if (bundle == null) {

            return;

        }

        try {

            List<BatteryTip> batteryTips = bundle.getParcelableArrayList(KEY_BATTERY_TIPS);

            updateBatteryTips(batteryTips);

        } catch (BadParcelableException e) {

            Log.e(TAG, "failed to invoke restoreInstanceState()", e);

        }

    }



    public void saveInstanceState(Bundle outState) {

        outState.putParcelableList(KEY_BATTERY_TIPS, mBatteryTips);

    public void saveInstanceState(Bundle bundle) {

        if (bundle == null) {

            return;

        }

        try {

            bundle.putParcelableList(KEY_BATTERY_TIPS, mBatteryTips);

        } catch (BadParcelableException e) {

            Log.e(TAG, "failed to invoke saveInstanceState()", e);

        }

    }



    public boolean needUpdate() {