Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
534,461 Commits 3 Branches 0 Tags
701dddc99a839e3d48a706d64a1d1260fd5e79dd
Commit Graph

106942 Commits

Author SHA1 Message Date
Mihai Popa
f824d9bd81 Merge "Remove reduntant variable" am: 5241a207fb am: 202dd72169 am: 7bd1fc8b4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280

Change-Id: I2edc4490358917aea0dc4061f4ba604898bb4208
 2020-06-05 22:35:40 +00:00
Mihai Popa
7bd1fc8b4e Merge "Remove reduntant variable" am: 5241a207fb am: 202dd72169 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280

Change-Id: Ie8bd86ae505cddb133844c6808b1e9e3cba5e32b
 2020-06-05 22:24:14 +00:00
TreeHugger Robot
92703b9ab7 Merge "Update textclassifier TEST_MAPPING file." into rvc-dev am: 78d74114aa am: 7b5d5fe082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11754101

Change-Id: Ib140ca101ea6b901f00fca3434370632b1bf9ac8
 2020-06-05 22:18:59 +00:00
TreeHugger Robot
7b5d5fe082 Merge "Update textclassifier TEST_MAPPING file." into rvc-dev am: 78d74114aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11754101

Change-Id: I2b0eaa02276062be874cb8e55414ac71a489aef6
 2020-06-05 22:12:17 +00:00
Mihai Popa
202dd72169 Merge "Remove reduntant variable" am: 5241a207fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280

Change-Id: Ia32ef697dbd37aa3c0988f5abd2c7c2ba598e32f
 2020-06-05 22:11:47 +00:00
TreeHugger Robot
78d74114aa Merge "Update textclassifier TEST_MAPPING file." into rvc-dev 2020-06-05 21:56:34 +00:00
Mihai Popa
5241a207fb Merge "Remove reduntant variable" 2020-06-05 21:56:01 +00:00
Vinit Nayak
b7e0b85efa Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 am: e5596e83cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: Ic10d90086aa672585eb04ca50c78e5f8b7dd366f
 2020-06-05 19:29:08 +00:00
Vinit Nayak
e5596e83cb Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I4ba1088269fec55593541d4a448cb511be5d470a
 2020-06-05 19:10:28 +00:00
Vinit Nayak
2983b70983 Merge "Pass displayId to onActivityRotation()" into rvc-dev 2020-06-05 18:58:32 +00:00
Ryan Mitchell
5efdfc829d Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 am: 3c7d44954d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I07cc171872594cb70591e7c63eb33dbfd6ec396e
 2020-06-05 18:44:21 +00:00
Ryan Mitchell
ccd12e5eed Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I0cd3e82bcde0625432f853b257d7fd1d0156197e
 2020-06-05 18:30:36 +00:00
Ryan Mitchell
3c7d44954d Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: Ie23c6a6fbd0dab380b4923883abd2fafe725891f
 2020-06-05 18:30:35 +00:00
Ryan Mitchell
0053a10ea0 Merge "Use a ReferenceQueue to prune weak references" into rvc-dev 2020-06-05 18:27:50 +00:00
Joanne Chung
a0adc25387 Update textclassifier TEST_MAPPING file. 
Add CtsTextClassifierTestCases and TextClassifierServiceTest into
presubmit.

Bug: 154961272
Test: atest --test-mapping frameworks/base/core/java/android/service/textclassifier
Test: atest --test-mapping frameworks/base/core/java/android/view/textclassifier
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/textclassifier
Change-Id: I123eeb0ce11e2b159ebbf20fe81dc682cd347230
 2020-06-06 01:49:27 +08:00
Liz Kammer
50be28db92 Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp am: e44a2b2bb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689878

Change-Id: I1dccb8e4da3285d48b65d5a6a5fb369f2b7bd959
 2020-06-05 15:38:41 +00:00
Liz Kammer
e44a2b2bb8 Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp 2020-06-05 15:16:59 +00:00
Automerger Merge Worker
4c074c50c1 Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into rvc-dev-plus-aosp am: 1772e0bee4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11685206

Change-Id: I34d4160bb497452239c97520482b3e71de70d523
 2020-06-05 03:37:33 +00:00
Treehugger Robot
ac36e5b0f8 Merge "Update javadoc to use complete sentence" am: 0be3cacedf am: ea9f9d821e am: e33d6e932a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I47f39a31a066f35a75690ca5ab4827b8d6a89a08
 2020-06-05 03:37:22 +00:00
Automerger Merge Worker
1772e0bee4 Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into rvc-dev-plus-aosp 
* changes:
  Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8ff
  Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761
 2020-06-05 03:36:58 +00:00
TreeHugger Robot
3aac79bd05 Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11473225

Change-Id: Id7f1364cf789acb458d158616174e23653a9269c
 2020-06-05 03:36:55 +00:00
TreeHugger Robot
224ce04e42 Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11473225

Change-Id: I5277cd97e46659df8c0398371f86c9880efca9ef
 2020-06-05 03:36:49 +00:00
Treehugger Robot
e33d6e932a Merge "Update javadoc to use complete sentence" am: 0be3cacedf am: ea9f9d821e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I357ae71b7f86ed3560333a67a2444eb8bb93c71c
 2020-06-05 03:36:44 +00:00
TreeHugger Robot
d5fb11a761 Merge "Get the instance count as the initial value" into rvc-dev 2020-06-05 03:34:32 +00:00
Treehugger Robot
ea9f9d821e Merge "Update javadoc to use complete sentence" am: 0be3cacedf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I6c8358c81bbc7a08802ef027fcd32adea4821ba0
 2020-06-05 03:17:00 +00:00
Amy Zhang
c7e54b5d44 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 am: 96b40c3613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: Icd3cf32f8d0460c960d54ab261e483d9c3e22064
 2020-06-05 03:16:38 +00:00
Charles Chen
12981bae2a Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 am: 84bf8d437c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700778

Change-Id: Icc0862e7e5bddd0975a433d2946ef142478c71a8
 2020-06-05 03:15:59 +00:00
Treehugger Robot
0be3cacedf Merge "Update javadoc to use complete sentence" 2020-06-05 03:02:36 +00:00
Amy Zhang
023916bd8a Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: If1355f8fceabcccabaf0dc9abe299112123a40b1
 2020-06-05 02:56:27 +00:00
Amy Zhang
96b40c3613 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: I6e2a47711651d9902bc05bf96f5b3ef780ec3630
 2020-06-05 02:56:20 +00:00
Charles Chen
05a5bfea80 Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700778

Change-Id: I470fdde6e1ea5705ecd7ea00f2b8e45230349a93
 2020-06-05 02:56:00 +00:00
Charles Chen
84bf8d437c Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700778

Change-Id: I9950fd52ff633983e7b3325ba528fb35fc901968
 2020-06-05 02:55:45 +00:00
Amy Zhang
a7dc4defd3 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev 2020-06-05 02:49:54 +00:00
Charles Chen
f3a7bc8e31 Merge "Make InputMethodService be an UI context" into rvc-dev 2020-06-05 02:40:17 +00:00
Charles Chen
5ed808bef5 Merge "Add an incorrect context violation on GestureDetector" into rvc-dev am: f843a85226 am: 2924e1eff0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593841

Change-Id: I388065d98d861fe5a5f4100ade639b9617023232
 2020-06-05 02:22:07 +00:00
Charles Chen
d74aad1eaf Merge "Add an incorrect context violation on GestureDetector" into rvc-dev am: f843a85226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593841

Change-Id: I822cebb05569beec5ce230715fa30a2a9b9f53d8
 2020-06-05 02:21:22 +00:00
Charles Chen
2924e1eff0 Merge "Add an incorrect context violation on GestureDetector" into rvc-dev am: f843a85226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593841

Change-Id: I0401ac40a7d2a51f3493a3029de2e2ab293509bb
 2020-06-05 02:21:14 +00:00
Charles Chen
f843a85226 Merge "Add an incorrect context violation on GestureDetector" into rvc-dev 2020-06-05 02:08:48 +00:00
Chiachang Wang
d7e7c7eb55 Merge "Update extra info before registering" am: 49d2af3662 am: cb4ec42283 am: 5422d57f59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: Ied436e6ae963d87cadfd2b1318429e0036fa509f
 2020-06-05 00:42:47 +00:00
Chiachang Wang
5422d57f59 Merge "Update extra info before registering" am: 49d2af3662 am: cb4ec42283 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35
 2020-06-05 00:41:42 +00:00
Chiachang Wang
cb4ec42283 Merge "Update extra info before registering" am: 49d2af3662 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I6eb786edfe615574c731097df09ae3142e137999
 2020-06-05 00:24:09 +00:00
Vinit Nayak
bedb9f33c2 Pass displayId to onActivityRotation() 
Bug: 154580671
Change-Id: I220e1e9ac1a381c6ebadc3849a393225d1f53e3e
 2020-06-04 17:15:32 -07:00
Chiachang Wang
49d2af3662 Merge "Update extra info before registering" 2020-06-05 00:04:04 +00:00
Jeff Sharkey
8dd445352e Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1fa am: 5bb776d88b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745078

Change-Id: If7b118885802f5126002c5c6ec8c36888be8dac1
 2020-06-04 23:56:28 +00:00
Jeff Sharkey
5bb776d88b Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745078

Change-Id: I72ef1b7bf14215c76ff67aea1941ab43a27f0e02
 2020-06-04 23:51:12 +00:00
Jeff Sharkey
26f1e23340 Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745078

Change-Id: Iac93d71dce312d955d76ca7b6b011720ccb5e7f0
 2020-06-04 23:51:07 +00:00
Jeff Sharkey
bb9ea4e1fa Merge "Logging to aid bug investigation." into rvc-dev 2020-06-04 23:47:14 +00:00
Matt Pietal
cc19753128 Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb501 am: 3c731d4928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11738038

Change-Id: I5a3294aa10328d2c5e4a3ac387a1440cd407bdba
 2020-06-04 23:45:11 +00:00
Jeff Sharkey
0a8e32c124 Logging to aid bug investigation. 
We're trying to figure out where volumes are disappearing.

Bug: 158059178
Test: none
Change-Id: I68959f0a163e2fece13fcb08a6c9f55ec1beb0f6
 2020-06-04 17:35:38 -06:00
Matt Pietal
745f8cdf9f Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb501 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11738038

Change-Id: Ib1bab5a6e10aba289b936c1965ae73855ca893cf
 2020-06-04 23:33:08 +00:00