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

Commit a3d321a1 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Don't supress failures in adopting shell permission identity. 

This is required as we've seen recent flakiness in our tests where
the only way to find out the root cause (DeadObjectException when
adopting permissions) is to look in logcat.

Test: btest CtsDevicePolicyTestCases
Bug: 262371074
Change-Id: I2291984c77494a4afca0e403938e75cab1363ba6
parent 89d3375f

core/java/android/app/UiAutomation.java

+4 −6
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import java.io.IOException; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Set;

import java.util.concurrent.TimeoutException;
@@ -484,7 +483,7 @@ public final class UiAutomation { 
            // Calling out without a lock held.

            mUiAutomationConnection.adoptShellPermissionIdentity(Process.myUid(), null);

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "Error executing adopting shell permission identity!", re);

            throw re.rethrowFromSystemServer();

        }

    }
@@ -509,7 +508,7 @@ public final class UiAutomation { 
            // Calling out without a lock held.

            mUiAutomationConnection.adoptShellPermissionIdentity(Process.myUid(), permissions);

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "Error executing adopting shell permission identity!", re);

            throw re.rethrowFromSystemServer();

        }

    }
@@ -525,7 +524,7 @@ public final class UiAutomation { 
            // Calling out without a lock held.

            mUiAutomationConnection.dropShellPermissionIdentity();

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "Error executing dropping shell permission identity!", re);

            throw re.rethrowFromSystemServer();

        }

    }
@@ -543,8 +542,7 @@ public final class UiAutomation { 
            final List<String> permissions = mUiAutomationConnection.getAdoptedShellPermissions();

            return permissions == null ? ALL_PERMISSIONS : new ArraySet<>(permissions);

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "Error getting adopted shell permissions", re);

            return Collections.emptySet();

            throw re.rethrowFromSystemServer();

        }

    }