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

Commit 62f79d6b authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Preventing system crash when pin slice fails 

ContentProvider calls can throw any generic exception it that was thrown
on the remote process. Ignore all such exceptions

Bug: 134802710
Test: atest PinnedSliceStateTest
Change-Id: I6f037905117adccbf5a65ee4ce4031f02aaa7780
parent 85a56ba1

services/core/java/com/android/server/slice/PinnedSliceState.java

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class PinnedSliceState { 
            b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri);

            try {

                client.call(SliceProvider.METHOD_PIN, null, b);

            } catch (RemoteException e) {

            } catch (Exception e) {

                Log.w(TAG, "Unable to contact " + mUri, e);

            }

        }
@@ -201,7 +201,7 @@ public class PinnedSliceState { 
            b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri);

            try {

                client.call(SliceProvider.METHOD_UNPIN, null, b);

            } catch (RemoteException e) {

            } catch (Exception e) {

                Log.w(TAG, "Unable to contact " + mUri, e);

            }

        }

services/tests/uiservicestests/src/com/android/server/slice/PinnedSliceStateTest.java

+23 −0
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -159,4 +161,25 @@ public class PinnedSliceStateTest extends UiServiceTestCase { 
        verify(mSliceService).removePinnedSlice(eq(TEST_URI));

        assertFalse(mPinnedSliceManager.hasPinOrListener());

    }



    @Test

    public void testPinFailed() throws Exception {

        // Throw exception when trying to pin

        doAnswer(invocation -> {

            throw new Exception("Pin failed");

        }).when(mIContentProvider).call(

                anyString(), anyString(), anyString(), eq(null), any());



        TestableLooper.get(this).processAllMessages();



        // When pinned for the first time, a pinned message should be sent.

        mPinnedSliceManager.pin("pkg", FIRST_SPECS, mToken);

        TestableLooper.get(this).processAllMessages();



        verify(mIContentProvider).call(anyString(), anyString(), eq(SliceProvider.METHOD_PIN),

                eq(null), argThat(b -> {

                    assertEquals(TEST_URI, b.getParcelable(SliceProvider.EXTRA_BIND_URI));

                    return true;

                }));

    }

}