aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li2023-10-060-0/+0
|\ | | | | | | | | | | | | | | | | | | | | -s ours am: ff2fbf654d -s ours am: 7d95f16fe7 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I6c3ae708500181534b07a6090acdebf221d75736 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * [automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li2023-10-060-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ff2fbf654d -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Ibd91bf6cd0ac247f5bf0b326d06635ec9077e81b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * [automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li2023-10-060-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I093af81fa9587d85c3a6aad982d0ef11f9cf5eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * [automerger skipped] Merge Android 14 am: 2f0ac31804 -s oursXin Li2023-10-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I251c7e3eaf2ecb4cdd9693ff21576e54942ab660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Merge Android 14Xin Li2023-10-054-39/+42
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Bug: 298295554 Merged-In: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c Change-Id: Ic4fcb094b37b72031f9bbd615e2044164aa460a6
* | | | | [automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s ours ↵Xin Li2023-08-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 37e099e693 -s ours am: 1016f83ad1 -s ours am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: Ia3ca741cbe0adc434a2af8c6469e41f3217c2f4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | [automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s ours ↵Xin Li2023-08-280-0/+0
|/| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 37e099e693 -s ours am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: Ic2b6fd50ca4a2643968e15c5c91ee0de2a3f250e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | [automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s oursXin Li2023-08-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: If8dffda8ab2042b01bcf5dea9d61bafe864b494b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Merge Android U (ab/10368041)Xin Li2023-08-144-39/+42
| | |\ \ | | |/ / | |/| / | | |/ | | | | | | Bug: 291102124 Merged-In: I7efbfd50628298c436cb86d5d84af6cbfa7918da Change-Id: Ic95053849a83d3c13510c05d5fd03cc6863f3b65
* | | Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2b ↵Treehugger Robot2023-03-206-11/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 64ce9427f8 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I68c483d1cc5ddea43cf9c9898fb152de14847427 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2bTreehugger Robot2023-03-206-11/+3
| |\| | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I7efbfd50628298c436cb86d5d84af6cbfa7918da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfcTreehugger Robot2023-03-206-11/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I2bae39a9a7e659300a47203f1b4c99a94c386513 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge "Remove unused variables" am: fe0c000f40Treehugger Robot2023-03-206-11/+3
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I996fc354112500e41977b93521e9050bdccce81b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge "Remove unused variables"Treehugger Robot2023-03-206-11/+3
| | |/|
| | | * Remove unused variablesJing Mike2023-03-196-11/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some variables with module LatinIME are defined but not used, when compiled with build combination "sdk_pc_x86_64-userdebug" and build command "mmm packages/inputmethods/LatinIME", the following code lines will be reported that "variable 'XXX' set but not used". (should be similar for all the other build combinations) Repeated 10 times for each: terminal_position_lookup_table.cpp:74:9 removedEntryCount terminal_position_lookup_table.cpp:85:9 removedEntryCount proximity_info_state_utils.cpp:493:9 tempTime trie_map.cpp:56:9 unusedRegionSize suggestion_results.cpp:100:9 index Repeated 80+ times: proximity_info_utils.h:75:25 proximityChar With this patch we are removing some of the unused variables and putting the C++ 17 attribute [[maybe_unused]] to the others which are used for logging. Then all the related build warnings have been eliminated. Test: mmm packages/inputmethods/LatinIME, presubmit check. Change-Id: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c Signed-off-by: Jing Mike <jingyangliu@eswincomputing.com>
* | | Merge "Add required flag to receivers in LatinIME" into udc-dev am: 7b0c5a98c1Michael Groover2023-03-141-4/+19
|\| | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21941666 Change-Id: I0feec251e3d9896f260527ec2c57835b7571dc18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Merge "Add required flag to receivers in LatinIME" into udc-devMichael Groover2023-03-141-4/+19
| |\ \
| | * | Add required flag to receivers in LatinIMEMichael Groover2023-03-091-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android T allows apps to declare a runtime receiver as not exported by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag; receivers registered with this flag will only receive broadcasts from the platform and the app itself. However to ensure developers can properly protect their receivers, all apps targeting U and registering a receiver for non-system broadcasts must specify either the exported or not exported flag when invoking registerReceiver; if one of these flags is not provided, the platform will throw a SecurityException. This commit updates the dictionary receivers with the RECEIVER_NOT_EXPORTED flag since these are only sent from the local app. The HIDE_SOFT_INPUT receiver is flagged with the RECEIVER_EXPORTED flag since it can be sent by any app with the corresponding permission. Bug: 234659204 Test: Build Change-Id: I2b9a1360e0eb1c1965c07cc71dca9f11eb153517
* | | | Baseline NewApi issues am: f5c1b4cc37Cole Faust2023-03-101-32/+12
|\| | | | |/ / |/| | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21913526 Change-Id: Ibb51acd8d25a1a6b27be4798f19336af60f11744 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Baseline NewApi issuesCole Faust2023-03-091-32/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | NewApi was recently updated to support linting methods in the system, module_lib, and system_server sdks, and was demoted to a warning due to the new issues it finds. Baseline all the new issues that NewApi can be made an error again. These cls were generated automatically by a script that copied the NewApi issues from the reference baselines. Bug: 268261262 Test: m lint-check Change-Id: I99bb901018da30f39cf799ac6c939863266cee34
* | [automerge] Update preparers to align across everything 2p: 3ae2304d4fJulien Desprez2022-12-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/20710172 Bug: 261855411 Change-Id: Ieaf01b3acea9cad11e2bc6d3d61a6b5811855c52
| * | Update preparers to align across everythingJulien Desprez2022-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Carry the exact same options. Test: presubmit Bug: 261855411 Change-Id: Ic48ffa4fec4ebf2027525476bf346abce3f0a1b0
* | | Merge "Fix errorprone warnings that should be errors" am: 6d585ed76c am: ↵Treehugger Robot2022-10-176-6/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 78a43f6c9c am: ce22ebc557 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2256807 Change-Id: I0b54d410fdabe3424e0eff31153048e474e93923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Merge "Fix errorprone warnings that should be errors" am: 6d585ed76c am: ↵Treehugger Robot2022-10-176-6/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78a43f6c9c Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2256807 Change-Id: Ie8d7a908adb83e2556d7b2d27beecc0e29978173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Merge "Fix errorprone warnings that should be errors" am: 6d585ed76cTreehugger Robot2022-10-176-6/+7
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2256807 Change-Id: I7d8662bdc880e331cf2d912dae7cc18b70743975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Merge "Fix errorprone warnings that should be errors"Treehugger Robot2022-10-176-6/+7
| | |\ \
| | | * | Fix errorprone warnings that should be errorsCole Faust2022-10-176-6/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I454a105ae82484a2d19aff1808e8d9dd55ba64f4
* | | | Declaring package visibility needs for LatinIMERhed Jao2022-09-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 179783492 Bug: 179783499 Bug: 216823971 Test: atest LatinIMETests Change-Id: I309ffefe261049a5d3abce8e16829cd66f9123dc
* | | | Merge "Fix array-related errorprone warnings" am: 370d41de92 am: 3a06d6180b ↵Treehugger Robot2022-08-241-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e546038cdf am: 51466cffd6 am: 2549e988db Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186538 Change-Id: Idd10a3df6c0a34fe3d14d493a8af5b64338f298f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | Merge "Fix array-related errorprone warnings" am: 370d41de92 am: 3a06d6180b ↵Treehugger Robot2022-08-241-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e546038cdf am: 51466cffd6 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186538 Change-Id: Ib3878ed212ae13dddd9761aefda2960cb7defbb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * \ \ Merge "Fix array-related errorprone warnings" am: 370d41de92 am: 3a06d6180b ↵Treehugger Robot2022-08-241-1/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e546038cdf Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186538 Change-Id: I609ca003a48f3eb2a323ed456fc54d5754bd694f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * \ \ Merge "Fix array-related errorprone warnings" am: 370d41de92 am: 3a06d6180bTreehugger Robot2022-08-241-1/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186538 Change-Id: Ic25b4e765f6612409aa840c7e4dc392d99fb254a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | Merge "Fix array-related errorprone warnings" am: 370d41de92Treehugger Robot2022-08-241-1/+3
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186538 Change-Id: I8c9cc9d63affa572ca6bf79ff156f69f7ee96db1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * | Merge "Fix array-related errorprone warnings"Treehugger Robot2022-08-241-1/+3
| | | | |/| |
| | | | | * | Fix array-related errorprone warningsCole Faust2022-08-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ArrayEquals, ArrayHashCode, ArrayToString, and ArraysAsListPrimitiveArray errorprone findings were demoted from errors to warnings. Fix existing occurrences of them so they can be made errors again. Bug: 242630963 Test: RUN_ERROR_PRONE=true m javac-check Change-Id: I689397a7196277de3fd301836e72f7555e2036cb
* | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7005e0c12f ↵Xin Li2022-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: b34de510ec -s ours am: a8004dc404 -s ours am: 50ddfe15d1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: I4d5fbc004bbefa42848bceadf659d0a25a57afbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7005e0c12f ↵Xin Li2022-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: b34de510ec -s ours am: a8004dc404 -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: Ifc14b063977916d54bec38aa1d4f7f09bbe9d401 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7005e0c12f ↵Xin Li2022-08-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: b34de510ec -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: I0aa5940a87d0a9cf5eb40d8d3841f0d0e6a7c310 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7005e0c12f ↵Xin Li2022-08-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: I2c79acfa20a9200db266fd982b142905ec8cf0b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | Merge "DO NOT MERGE - Merge Android 13"Xin Li2022-08-167-59/+150
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 13 am: 2012c03ae7 -s ours ↵Xin Li2022-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9238ba585c -s ours am: c17909460e -s ours am: 7aa0255dc4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: Icf9ef9d150be644dad93e1284f343ee178da1dc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | [automerger skipped] DO NOT MERGE - Merge Android 13 am: 2012c03ae7 -s ours ↵Xin Li2022-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9238ba585c -s ours am: c17909460e -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: I35d476cbc57a934f0ba08a3ef203a1ec42ad7cd5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | [automerger skipped] DO NOT MERGE - Merge Android 13 am: 2012c03ae7 -s ours ↵Xin Li2022-08-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9238ba585c -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: I210262f2fe9ad726ae1c4c9a832ec6db5fd76a80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | [automerger skipped] DO NOT MERGE - Merge Android 13 am: 2012c03ae7 -s oursXin Li2022-08-160-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2186832 Change-Id: Ifa4bae36305d050c1a6b5a569ad471f85a9d51d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | DO NOT MERGE - Merge Android 13Xin Li2022-08-157-59/+150
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 242648940 Merged-In: Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 Change-Id: Id6eef7910c3955e9dd6c49749406520d86e73dad
* | | | | | | Make DownloadOverMeteredDialog not exportedWilson Wu2022-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DownloadOverMeteredDialog is exported which may allow a app to prompt this dialog to ask the user to download dictionary. Since the app can control the download dictionary size and may show an incorrect size for user to make security concern. Make the activity not exported for apps to launch. Bug: 236688064 Test: Manual test as follow steps: 1. lunch aosp_bramble-userdebug and flash 2. Verify the AOSP keyboard work properly 3. Launch the PoC test app 4. Verify the DownloadOverMeteredDialog cannot be launched Change-Id: I9be92ba2813e7aaad0ef10555f585c5c8a25361f
* | | | | | | [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li2022-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f20a65101 -s ours am: 612860d449 -s ours am: 3b9989cf61 -s ours am: ee92039436 -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/19094630 Change-Id: I7c5005a08310756d2879e65a8da6437a1c1bc961 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li2022-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f20a65101 -s ours am: 612860d449 -s ours am: 3b9989cf61 -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/19094630 Change-Id: Ic73fb15f7f2918bd2a5bb5f318abad607240209b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li2022-06-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f20a65101 -s ours am: 612860d449 -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/19094630 Change-Id: I8e3947377fc021574b7d21f76873f4c119e355ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li2022-06-290-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f20a65101 -s ours am skip reason: Merged-In Ib4b72e0a277d8b2fb78837bed5d2e9cccd819a07 with SHA-1 f134ea3848 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/19094630 Change-Id: I096e09860be31172ba86e1770c15b59013b8af2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>