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

Commit 3218da13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Properly handle onNullBinding() in appwidget service." into sc-dev am:... 

Merge "Properly handle onNullBinding() in appwidget service." into sc-dev am: 30f9963e am: 90553857 am: 95ebd317 am: 3cbbff62

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



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

core/java/android/widget/RemoteViewsAdapter.java

+5 −0
Original line number Diff line number Diff line
@@ -240,6 +240,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback 
            }

        }



        @Override

        public void onNullBinding(ComponentName name) {

            enqueueDeferredUnbindServiceMessage();

        }



        @Override

        public void handleMessage(Message msg) {

            RemoteViewsAdapter adapter = mAdapter.get();

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+10 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                mContext.unbindService(this);

            }



            @Override

            public void onNullBinding(ComponentName name) {

                mContext.unbindService(this);

            }



            @Override

            public void onServiceDisconnected(ComponentName name) {

                // Do nothing
@@ -1938,6 +1943,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                                mContext.unbindService(this);

                            }



                            @Override

                            public void onNullBinding(ComponentName name) {

                                mContext.unbindService(this);

                            }



                            @Override

                            public void onServiceDisconnected(android.content.ComponentName name) {

                                // Do nothing