diff options
author | Jonathan Scott <scottjonathan@google.com> | 2021-05-19 13:23:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-19 13:23:38 +0000 |
commit | 7f67483a1ca17db3dc6d388eec40befa7fe22b89 (patch) | |
tree | 62edfd5f2c13fd0b825422d7f53bef0753a88879 /processor/src | |
parent | e4b0095e70a5053b7fb9a8efa8543f131831083d (diff) | |
parent | 5db413da58c5fcb8a7ccaa65a67b5e01bdffe727 (diff) | |
download | connectedappssdk-android-mainline-12.0.0_r75.tar.gz |
Fixes for RemoteDPC + Tests. am: 5db413da58android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/14639253
Change-Id: Ib8a3bb4ee3a9f9dfb690a8e3aff35a3e23b0a172
Diffstat (limited to 'processor/src')
-rw-r--r-- | processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java index ff45251..f5264b0 100644 --- a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java +++ b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java @@ -92,7 +92,6 @@ final class DispatcherGenerator { .initializer("new $T()", PARCEL_CALL_RECEIVER_CLASSNAME) .build()); - addEnsureValidCallerMethod(classBuilder); addCallMethod(classBuilder); addPrepareCallMethod(classBuilder); addFetchResponseMethod(classBuilder); @@ -109,7 +108,6 @@ final class DispatcherGenerator { .addParameter(int.class, "blockId") .addParameter(int.class, "numBytes") .addParameter(ArrayTypeName.of(byte.class), "paramBytes") - .addStatement("ensureValidCaller(context)") .addStatement("parcelCallReceiver.prepareCall(callId, blockId, numBytes, paramBytes)") .addJavadoc( "Store a block of bytes to be part of a future call to\n" @@ -142,7 +140,6 @@ final class DispatcherGenerator { .addParameter(long.class, "callId") .addParameter(int.class, "blockId") .returns(ArrayTypeName.of(byte.class)) - .addStatement("ensureValidCaller(context)") .addStatement("return parcelCallReceiver.getPreparedResponse(callId, blockId)") .addJavadoc( "Fetch a response block if a previous call to\n {@link #call(Context, long, int," @@ -157,41 +154,11 @@ final class DispatcherGenerator { classBuilder.addMethod(prepareCallMethod); } - private static void addEnsureValidCallerMethod(TypeSpec.Builder classBuilder) { - CodeBlock.Builder methodCode = CodeBlock.builder(); - - methodCode.addStatement( - "$T[] callingPackageNames =" - + " context.getPackageManager().getPackagesForUid($T.getCallingUid())", - String.class, - BINDER_CLASSNAME); - methodCode.beginControlFlow("for (String callingPackageName : callingPackageNames)"); - methodCode.beginControlFlow("if (context.getPackageName().equals(callingPackageName))"); - methodCode.addStatement("return"); - methodCode.endControlFlow(); - methodCode.endControlFlow(); - - methodCode.addStatement( - "throw new $T(\"Cross-profile functionality is only available within the same package\")", - IllegalStateException.class); - - MethodSpec ensureValidCallerMethod = - MethodSpec.methodBuilder("ensureValidCaller") - .addModifiers(Modifier.PRIVATE, Modifier.STATIC) - .addParameter(CONTEXT_CLASSNAME, "context") - .addCode(methodCode.build()) - .build(); - - classBuilder.addMethod(ensureValidCallerMethod); - } - private void addCallMethod(TypeSpec.Builder classBuilder) { CodeBlock.Builder methodCode = CodeBlock.builder(); methodCode.beginControlFlow("try"); - methodCode.addStatement("ensureValidCaller(context)"); - methodCode.addStatement( "$1T parcel = parcelCallReceiver.getPreparedCall(callId, blockId, paramBytes)", PARCEL_CLASSNAME); |