Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove garbage spaces" am: b29fb46920 am: fcce9c56d4 am: 045833a959 am: baa4f33e46

Browse Source 
Change-Id: I21c3391f072e2f38422de818ff1f7c6795fbaca7
This commit is contained in:
Mathew Inwood
2020-05-20 10:28:36 +00:00
committed by Automerger Merge Worker
parent c0687d33cd baa4f33e46
commit d29baf7a09
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/Registrant.java
View File

@@ -46,7 +46,7 @@ public class Registrant
{ {
internalNotifyRegistrant (null, null); internalNotifyRegistrant (null, null);
} }
@UnsupportedAppUsage @UnsupportedAppUsage
public void public void
notifyResult(Object result) notifyResult(Object result)
@@ -81,9 +81,7 @@ public class Registrant
Message msg = Message.obtain(); Message msg = Message.obtain();
msg.what = what; msg.what = what;
msg.obj = new AsyncResult(userObj, result, exception); msg.obj = new AsyncResult(userObj, result, exception);
h.sendMessage(msg); h.sendMessage(msg);
} }
} }
@@ -126,4 +124,3 @@ public class Registrant
int what; int what;
Object userObj; Object userObj;
} }

12
core/java/android/os/RegistrantList.java
View File

@@ -42,9 +42,9 @@ public class RegistrantList
{ {
// if the handler is already in the registrant list, remove it // if the handler is already in the registrant list, remove it
remove(h); remove(h);
add(new Registrant(h, what, obj)); add(new Registrant(h, what, obj));
} }
@UnsupportedAppUsage @UnsupportedAppUsage
public synchronized void public synchronized void
add(Registrant r) add(Registrant r)
@@ -59,7 +59,7 @@ public class RegistrantList
{ {
for (int i = registrants.size() - 1; i >= 0 ; i--) { for (int i = registrants.size() - 1; i >= 0 ; i--) {
Registrant r = (Registrant) registrants.get(i); Registrant r = (Registrant) registrants.get(i);
if (r.refH == null) { if (r.refH == null) {
registrants.remove(i); registrants.remove(i);
} }
@@ -92,7 +92,7 @@ public class RegistrantList
r.internalNotifyRegistrant(result, exception); r.internalNotifyRegistrant(result, exception);
} }
} }
@UnsupportedAppUsage @UnsupportedAppUsage
public /*synchronized*/ void public /*synchronized*/ void
notifyRegistrants() notifyRegistrants()
@@ -113,14 +113,14 @@ public class RegistrantList
internalNotifyRegistrants (result, null); internalNotifyRegistrants (result, null);
} }
@UnsupportedAppUsage @UnsupportedAppUsage
public /*synchronized*/ void public /*synchronized*/ void
notifyRegistrants(AsyncResult ar) notifyRegistrants(AsyncResult ar)
{ {
internalNotifyRegistrants(ar.result, ar.exception); internalNotifyRegistrants(ar.result, ar.exception);
} }
@UnsupportedAppUsage @UnsupportedAppUsage
public synchronized void public synchronized void
remove(Handler h) remove(Handler h)