Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
dfa3917c27 [automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours 
am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf08740f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360733

Change-Id: I582872307553ad85854541cf42e684ba7712917b
 2020-07-22 17:54:17 +00:00
Anton Hansson
fa06d8c994 [automerger skipped] Merge "Add bp-based disting of android stubs" am: 6b54515b61 am: 3f54a52cc3 -s ours 
am skip reason: Change-Id Id54507e297b5c57d1ce58f14eb347e7661a5328d with SHA-1 d116c60383 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368436

Change-Id: I5db464913cba2e1964be38a3695d87493f94fbc3
 2020-07-22 17:53:46 +00:00
Elliott Hughes
ff2b9d5cb4 Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360733

Change-Id: I920005c586557faa6b5d7b614506593673ddcfad
 2020-07-22 17:33:38 +00:00
Anton Hansson
3f54a52cc3 Merge "Add bp-based disting of android stubs" am: 6b54515b61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368436

Change-Id: I7120ce6cc0c235f60476e0cb9bb5362a42f14a65
 2020-07-22 17:32:13 +00:00
Elliott Hughes
4a724fc1ee Merge "Remove the watchdog's fd tracker." 2020-07-22 17:15:46 +00:00
Anton Hansson
6b54515b61 Merge "Add bp-based disting of android stubs" 2020-07-22 17:12:42 +00:00
Leon Scroggins III
f663182d52 Update graphics language to comply with Android’s inclusive language guidance 
Bug: 161896447
Test: make

See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I57b81fb5fd2177fbf96f9cc900097f7da1955fca
 2020-07-22 13:00:12 -04:00
Anton Hansson
d361e4cd7b [automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours am: 1dd4f123cf -s ours 
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357

Change-Id: I3bd33f57952ef701d77bcabc56674adf1bbc6af8
 2020-07-22 16:47:47 +00:00
Anton Hansson
1dd4f123cf [automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours 
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357

Change-Id: If7d3964a69782b4e4afd819fe5013eadf549b291
 2020-07-22 16:33:32 +00:00
Anton Hansson
a920550096 Add bp-based disting of android stubs 
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.

Bug: 161214753
Test: diff results of `m sdk dist`
Merged-In: Id54507e297b5c57d1ce58f14eb347e7661a5328d
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
 2020-07-22 16:20:46 +00:00
Anton Hansson
6953bc127b Merge "Add explicit dep on services.backup" am: 20b012282e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357

Change-Id: Ib26cddaf0cb9236dffa0937fb8b95a2cf3422aea
 2020-07-22 16:11:05 +00:00
Anton Hansson
20b012282e Merge "Add explicit dep on services.backup" 2020-07-22 15:55:41 +00:00
Anton Hansson
b2fb9636b9 Add explicit dep on services.backup 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Test: m RunFrameworksServicesRoboTests
Change-Id: Ice2abeb3f4d031cfe15ce919b750d6de59316c1f
Merged-In: Ice2abeb3f4d031cfe15ce919b750d6de59316c1f
 2020-07-22 15:38:33 +01:00
Treehugger Robot
14f88702b1 [automerger skipped] Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 am: 8f6335b3fa -s ours 
am skip reason: Change-Id I9802b8712798054a85307e549fb665bc85166311 with SHA-1 3a3af2fc2f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056

Change-Id: I93b4b9e3787ceebf55aadb7b79e590e5ea31121c
 2020-07-22 10:59:50 +00:00
Treehugger Robot
8f6335b3fa Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056

Change-Id: I1e1a8a324c441f6992414eeafc99b2cec908982d
 2020-07-22 10:40:06 +00:00
Treehugger Robot
8a84baa296 Merge "Add carrier config for NR timer reset" am: 71b90ae022 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056

Change-Id: Ifd504c77fb45ceee458899560e24a8c6e1dbfff7
 2020-07-22 10:17:53 +00:00
Treehugger Robot
71b90ae022 Merge "Add carrier config for NR timer reset" 2020-07-22 10:06:59 +00:00
Anton Hansson
b897b0b7b6 Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am: c9de0dd4e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202891

Change-Id: I9f5fa89886f5220df89f3f145e2ce06c5a825e9a
 2020-07-22 09:47:13 +00:00
Anton Hansson
c9de0dd4e2 Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp 2020-07-22 09:44:26 +00:00
Automerger Merge Worker
58ff205f6b Merge "Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 52c75a500b" into rvc-d1-dev-plus-aosp 2020-07-22 09:41:51 +00:00
TreeHugger Robot
afafda2626 Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 52c75a500b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I3abb5638dac8d38d3237304bf94c4c011ce75fb1
 2020-07-22 09:41:39 +00:00
TreeHugger Robot
efc122a820 Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 8c8fa3588d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: Id4e6007456afd963de6ca3c0f9c1c1399028e5ce
 2020-07-22 09:41:27 +00:00
TreeHugger Robot
52c75a500b Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I5592eaf614f3dfcfbd8ab57550af954cb26c3f8d
 2020-07-22 09:22:51 +00:00
TreeHugger Robot
8c8fa3588d Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I36d56a7258c7985467032ddd3e896c677562ba91
 2020-07-22 09:22:42 +00:00
TreeHugger Robot
dd4a89ba14 Merge "Fix NavigationBarColorTest" into rvc-dev 2020-07-22 09:13:13 +00:00
Matthew Mintz
0d862123c1 Merge "Remove callbacks and messages in onDestroy()." into rvc-dev-plus-aosp am: e86b1a1574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202965

Change-Id: I7c4fd257db7b1d7199d79350f7529a3b5fd3eaf2
 2020-07-22 08:36:50 +00:00
Matthew Mintz
e86b1a1574 Merge "Remove callbacks and messages in onDestroy()." into rvc-dev-plus-aosp 2020-07-22 08:27:14 +00:00
Anton Hansson
d116c60383 Add bp-based disting of android stubs 
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.

Bug: 161214753
Test: diff results of `m sdk dist`
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
 2020-07-22 08:52:21 +01:00
Sergey Nikolaienkov
8c68c6cc7b Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a am: 71f8e0fbc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: I8e36e6ac86d354094f2d0700da8a6f61bac56f5f
 2020-07-22 07:04:07 +00:00
Sergey Nikolaienkov
71f8e0fbc2 Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: Id65701e738cd523032166eb48e1aba052f55defa
 2020-07-22 06:51:45 +00:00
Matthew Mintz
c8eee94e1b Remove callbacks and messages in onDestroy(). 
The Runnable is running after destroying the Cursor, which only happens in onDestroy(). So clean up before that happens.

Bug: 151283186
Test: Built, installed, and set ringtone.
Change-Id: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
Merged-In: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
(cherry picked from commit 2e23b5c013)
 2020-07-22 06:44:31 +00:00
Sergey Nikolaienkov
f453a23f6a Merge "Make Shell require permission for a new CTS test" am: e3548b2259 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: If1c63eb9bff844be0b35cd2400ff683bd566a239
 2020-07-22 06:39:01 +00:00
Sergey Nikolaienkov
e3548b2259 Merge "Make Shell require permission for a new CTS test" 2020-07-22 06:17:36 +00:00
Taran Singh
588fa46cf4 Fix NavigationBarColorTest 
Manually partially revert I4910c2a06cc67b0470477b245fc1de54b75f10f9 so
that we don't use a window that's animating away as control target.

Fix: 161659326
Bug: 153145997
Test: atest NavigationBarColorTest#testSetNavigationBarColor

Change-Id: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
 2020-07-21 17:49:17 -07:00
TreeHugger Robot
a4b6ce3b6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203662

Change-Id: I5cee8db09e4046199bdc5b54ff7bbdd6556df219
 2020-07-22 00:47:10 +00:00
Automerger Merge Worker
1995e8a35c Merge "Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684" into rvc-d1-dev-plus-aosp 2020-07-22 00:46:56 +00:00
Kevin Hufnagle
87587094db Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I0ef22dd9c5377dd5a42990abce68cc15935ef72d
 2020-07-22 00:46:42 +00:00
Kevin Hufnagle
9b5478a0b9 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: If30564dd38a5e5f21373543d66de9158fee4623a
 2020-07-22 00:46:40 +00:00
TreeHugger Robot
d381a1af79 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-22 00:33:18 +00:00
Kevin Hufnagle
269b829684 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: If709a97f28281e1da2087535f5dbabaa8e233dd8
 2020-07-22 00:29:19 +00:00
Kevin Hufnagle
eb65f3d86b Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I8c487c80dbe20844d5907d9a1b92a9653fae2dfa
 2020-07-22 00:29:12 +00:00
Yifan Hong
9e55b45cdf VINTF: Remove skipCache boolean. 
Test: pass
Change-Id: Iec1aa7f7c2ef203ff2f1fd6adb456baec24c075a
 2020-07-21 17:28:12 -07:00
Yifan Hong
85429d850f Debug.isVmapStack reads kernel configs only 
... but not other runtime VINTF info. This may or may
not fix the nullptr exception when accessing getRuntimeInfo().

In either case, this change should improves code health in general:
- it avoids reading things it doesn't need
- it avoids copying the map

Bug: 151092221
Test: m libandroid_runtime -j

Change-Id: I6cb9052eb56fd83ef7ee81751d9791533a36aeed
(cherry picked from commit 77c1f592fa)
Merged-In: I6cb9052eb56fd83ef7ee81751d9791533a36aeed
 2020-07-21 17:26:14 -07:00
android-build-team Robot
1a57c0fe13 Merge cherrypicks of [12204290, 12204195, 12205772, 12205773, 12205663] into rvc-release 
Change-Id: I96f4acd2bc4ae6cccf9bdb93f9c84d34b24603da
 2020-07-22 00:22:10 +00:00
Wilson Wu
bb2eb8cc32 Prevent exception when surrounding text retrieval 
We use same reference from TextView to set the initial
surrounding text. The actual surrounding text may be
modified before retrieval since the mSurroundingText
is mutable. Use a copy of subText should avoid this
concurrent issue.

Bug: 160390184
Test: atest FrameworksCoreTests:EditorInfoTest
Change-Id: I6082a4cae2fcdc4c529dc14e2e5e7a45ab1aae4d
(cherry picked from commit 0ebe70cb0f)
 2020-07-22 00:21:56 +00:00
Kenny Root
fa5cc51c8d Resume-on-Reboot: remove special string 
User feedback shows that this string causes confusion that the
update is going to start immediately.

Bug: 161179448
Test: Fake OTA test
Change-Id: I9590ebf76c81ef104f490ba31ada7c482cd70d56
(cherry picked from commit 3750b50e76)
 2020-07-22 00:21:48 +00:00
Kevin Hufnagle
5c4491e04b Merge "docs: Use more inclusive pronouns" into rvc-dev 2020-07-22 00:07:00 +00:00
Treehugger Robot
d8447c1fa6 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I455e3070b6692cd45cf94053b2112c06b87eb2b0
 2020-07-21 21:53:28 +00:00
Treehugger Robot
1c4d68f863 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I85a1b1a2f43df5cf78abc902abb0633fd97bf469
 2020-07-21 21:28:23 +00:00
Treehugger Robot
0796fa5254 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I294cc7eb605e6a000b7e6cd765c76595c1c4ff6b
 2020-07-21 21:09:53 +00:00