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

Merge changes Ib2ff7e44,I950d614d,Ic87c2f8e into stage-aosp-master

Browse Source 
am: a293fbabf9

Change-Id: I1abdea04fd5175e32f0a417f31b7accb470d920f
This commit is contained in:
Hall Liu
2018-10-25 20:10:26 -07:00
committed by android-build-merger
parent db204d5d05 a293fbabf9
commit da0497491a
7 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java
View File

@@ -43,18 +43,18 @@ public class InternalDownloadProgressListener extends IDownloadProgressListener.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppListener.onProgressUpdated(request, fileInfo, currentDownloadSize, mAppListener.onProgressUpdated(request, fileInfo, currentDownloadSize,
fullDownloadSize, currentDecodedSize, fullDecodedSize); fullDownloadSize, currentDecodedSize, fullDecodedSize);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
public void stop() { public void stop() {

54
telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java
View File

@@ -40,17 +40,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onError(errorCode, message); mAppCallback.onError(errorCode, message);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -59,17 +59,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onFileServicesUpdated(services); mAppCallback.onFileServicesUpdated(services);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -78,17 +78,17 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onMiddlewareReady(); mAppCallback.onMiddlewareReady();
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
public void stop() { public void stop() {

18
telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java
View File

@@ -42,17 +42,17 @@ public class InternalDownloadStatusListener extends IDownloadStatusListener.Stub
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppListener.onStatusUpdated(request, fileInfo, status); mAppListener.onStatusUpdated(request, fileInfo, status);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
public void stop() { public void stop() {

54
telephony/java/android/telephony/mbms/InternalGroupCallCallback.java
View File

@@ -38,17 +38,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub {
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onError(errorCode, message); mAppCallback.onError(errorCode, message);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -57,17 +57,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub {
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onGroupCallStateChanged(state, reason); mAppCallback.onGroupCallStateChanged(state, reason);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -76,17 +76,17 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub {
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength); mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
/** Prevents this callback from calling the app */ /** Prevents this callback from calling the app */

72
telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java
View File

@@ -39,17 +39,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onError(errorCode, message); mAppCallback.onError(errorCode, message);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -58,17 +58,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onAvailableSaisUpdated(currentSais, availableSais); mAppCallback.onAvailableSaisUpdated(currentSais, availableSais);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -77,17 +77,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onServiceInterfaceAvailable(interfaceName, index); mAppCallback.onServiceInterfaceAvailable(interfaceName, index);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -96,17 +96,17 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onMiddlewareReady(); mAppCallback.onMiddlewareReady();
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
/** Prevents this callback from calling the app */ /** Prevents this callback from calling the app */

90
telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java
View File

@@ -39,17 +39,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onError(errorCode, message); mAppCallback.onError(errorCode, message);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -58,17 +58,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onStreamStateUpdated(state, reason); mAppCallback.onStreamStateUpdated(state, reason);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -77,17 +77,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onMediaDescriptionUpdated(); mAppCallback.onMediaDescriptionUpdated();
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -96,17 +96,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength); mAppCallback.onBroadcastSignalStrengthUpdated(signalStrength);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -115,17 +115,17 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback.
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onStreamMethodUpdated(methodType); mAppCallback.onStreamMethodUpdated(methodType);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
public void stop() { public void stop() {

54
telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java
View File

@@ -40,17 +40,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onError(errorCode, message); mAppCallback.onError(errorCode, message);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -60,17 +60,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onStreamingServicesUpdated(services); mAppCallback.onStreamingServicesUpdated(services);
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
@Override @Override
@@ -79,17 +79,17 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb
return; return;
} }
mExecutor.execute(new Runnable() { long token = Binder.clearCallingIdentity();
@Override try {
public void run() { mExecutor.execute(new Runnable() {
long token = Binder.clearCallingIdentity(); @Override
try { public void run() {
mAppCallback.onMiddlewareReady(); mAppCallback.onMiddlewareReady();
} finally {
Binder.restoreCallingIdentity(token);
} }
} });
}); } finally {
Binder.restoreCallingIdentity(token);
}
} }
public void stop() { public void stop() {