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

Commit a940068d authored by Tim Yu's avatar Tim Yu Committed by Android (Google) Code Review
Browse files

Merge changes I7cc11e08,Ia2afd2e4 into udc-dev 

* changes:
  Fix SecurityException in Autofill
  Catch all exceptions in AutofillManagerService methods.
parents 0f07b01f b9e2e28c

core/java/android/view/autofill/AutofillManager.java

+9 −8
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get enabled autofill services status.");

            throw new RuntimeException("Fail to get enabled autofill services status. " + e);

        }

    }
@@ -2084,7 +2084,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get autofill services component name.");

            throw new RuntimeException("Fail to get autofill services component name. " + e);

        }

    }
@@ -2111,7 +2111,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get user data id for field classification.");

            throw new RuntimeException("Fail to get user data id for field classification. " + e);

        }

    }
@@ -2134,7 +2134,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get user data for field classification.");

            throw new RuntimeException("Fail to get user data for field classification. " + e);

        }

    }
@@ -2174,7 +2174,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get field classification enabled status.");

            throw new RuntimeException("Fail to get field classification enabled status. " + e);

        }

    }
@@ -2198,7 +2198,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get default field classification algorithm.");

            throw new RuntimeException("Fail to get default field classification algorithm. " + e);

        }

    }
@@ -2220,7 +2220,8 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get available field classification algorithms.");

            throw new

                RuntimeException("Fail to get available field classification algorithms. " + e);

        }

    }
@@ -2244,7 +2245,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get autofill supported status.");

            throw new RuntimeException("Fail to get autofill supported status. " + e);

        }

    }