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

Commit 249989ba authored by Tim Yu's avatar Tim Yu Committed by Automerger Merge Worker
Browse files

Merge changes I7cc11e08,Ia2afd2e4 into udc-dev am: a940068d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23522146



Change-Id: Ib27d7c198bfcd00964051ed537765d262581863a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d6a580d a940068d

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

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

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } 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) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

        } catch (SyncResultReceiver.TimeoutException e) {

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

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

        }

        }

    }

    }

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+284 −134

File changed.

Preview size limit exceeded, changes collapsed.