Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
515,843 Commits 3 Branches 0 Tags
87cfefce3ed88d29fa7aeae01fe7ade2bc0b9f0e
Commit Graph

515843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
87cfefce3e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp 2020-07-21 19:48:26 +00:00
Bill Yi
3eae26d4e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0918971bd3a775cf542987f2ecf84165e41f5fc
 2020-07-21 19:48:19 +00:00
TreeHugger Robot
26cf70ebd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8bf888c7e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfae9651099b4f9ba8e033ef4b69e1b5151b61d1
 2020-07-21 19:48:17 +00:00
Bill Yi
a747743325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 38574ef1c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08cb049565913861609a9575ef49bd73907be0ed
 2020-07-21 19:48:01 +00:00
TreeHugger Robot
8bf888c7e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-21 19:34:23 +00:00
Bill Yi
5bef533f30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae907766a88573fa22636a51b5896d889d7666c2
 2020-07-21 19:29:14 +00:00
Bill Yi
38574ef1c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab3be36ee56712992b94faf9cdd0c31bfd23a13d
 2020-07-21 19:28:56 +00:00
Max Spector
2bbf66ecd0 Merge "Fuzzer for libandroidfw" am: 01e469da99 am: d117bf6d02 am: 5565cad3c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365297

Change-Id: If84b8483491f72bc04cdafa033dc1635ab342ea0
 2020-07-21 18:45:08 +00:00
Max Spector
5565cad3c8 Merge "Fuzzer for libandroidfw" am: 01e469da99 am: d117bf6d02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365297

Change-Id: Ie7f14493a2df991c81693513fec48f2fa691497e
 2020-07-21 18:29:30 +00:00
Max Spector
d117bf6d02 Merge "Fuzzer for libandroidfw" am: 01e469da99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365297

Change-Id: I4f08b42d1fb8d7ac05f0382a0a2b803e5bf96687
 2020-07-21 18:11:40 +00:00
Anton Hansson
b96e771e68 Merge "Whitelist settings robotests to access wifi impl details" into rvc-dev-plus-aosp am: d672b0bd22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12200702

Change-Id: Id2e4d14fff77d567db95fba7789f56fd75be620c
 2020-07-21 18:11:38 +00:00
Anton Hansson
d672b0bd22 Merge "Whitelist settings robotests to access wifi impl details" into rvc-dev-plus-aosp 2020-07-21 17:51:18 +00:00
Max Spector
01e469da99 Merge "Fuzzer for libandroidfw" 2020-07-21 17:44:23 +00:00
vichang
afbfec08c7 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 am: da5838aa43 am: 36a3657be8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: I2f8a2bf66f5acac30b57140d6304646826d3c7c2
 2020-07-21 17:12:09 +00:00
vichang
36a3657be8 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 am: da5838aa43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: I8fbfc4e551396b32c1aafab4aa750af1baa7c827
 2020-07-21 16:56:31 +00:00
vichang
da5838aa43 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: Ie21a4ad21d4af2417f7495039582938a124403f5
 2020-07-21 16:28:34 +00:00
vichang
3bd9f08ae5 Merge "Use DateFormatSymbols directly instead of using LocaleData" 2020-07-21 16:14:26 +00:00
Treehugger Robot
32f405be5d Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db am: 5dd5e5c937 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: Ib38af6404d351410af3c66e5c4bef97bc8f3cef3
 2020-07-21 16:08:11 +00:00
Anton Hansson
04083d6ce8 Merge "Remove service stub dep on default libs" am: 58095aa504 am: 4a55da60f0 am: 3b7d9c468f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368337

Change-Id: Ia383f987fb0b84c4285a5c999aab804e5cc5e3a9
 2020-07-21 16:07:41 +00:00
Treehugger Robot
5dd5e5c937 Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: I6da0050ca6e1cf3907d4e19fefa391da1816641a
 2020-07-21 15:56:11 +00:00
Anton Hansson
3b7d9c468f Merge "Remove service stub dep on default libs" am: 58095aa504 am: 4a55da60f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368337

Change-Id: I779b524a47a622303f6bc113c95d67619531e3bc
 2020-07-21 15:55:41 +00:00
Treehugger Robot
c3fb05c1db Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: I13cb6bd151b1367b0e66b6a3039ed7796b4bb383
 2020-07-21 15:38:45 +00:00
Anton Hansson
4a55da60f0 Merge "Remove service stub dep on default libs" am: 58095aa504 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368337

Change-Id: If85e1c609a7629491480bea4cd36893fd70c5ae7
 2020-07-21 15:37:59 +00:00
Treehugger Robot
1710dbd097 Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" 2020-07-21 15:32:16 +00:00
Anton Hansson
58095aa504 Merge "Remove service stub dep on default libs" 2020-07-21 15:16:44 +00:00
Eduardo Rocha
935178e2fd Fuzzer for libandroidfw 
Bug: 161463861
Test: Builds and runs on host and device.

Change-Id: I78b19376275dc5a29afcab48c70eea479bff8728
 2020-07-21 13:51:37 +00:00
Anton Hansson
4304e60655 Remove service stub dep on default libs 
Not specifying any sdk_version defaults the library to building
against the platform internals. We do not want to build the stubs
against the platform internals, as that risks leaking internals
in the stubs.

Follow what the other stubs are doing, which is to build against
no default libs, and compiling with java version 1.8.

Bug: 158850553
Test: m
Change-Id: I310842747422b108ac2a1fcf11afac5c323ed5b1
 2020-07-21 14:37:25 +01:00
Bill Yi
6d9cf96add Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ce5b227c1bd6a5db3532d258167d33fcdd2549a
 2020-07-21 06:01:03 -07:00
vichang
ba3ebf0844 Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: I6b721c9fbac71bdc75ce2682f06d67f8916e25a9
 2020-07-21 09:53:28 +00:00
vichang
d7b8bede26 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee am: 85c56c1fa4 am: c675c3e826 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I3634fc38644ec7f48d5ee1e0b016e7411e999d5e
 2020-07-21 09:53:07 +00:00
vichang
70862e266e Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: Iab8475912ecf95b90d24eb5b2dc9165e4442a347
 2020-07-21 09:36:43 +00:00
vichang
c675c3e826 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee am: 85c56c1fa4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I6ff83f882fac3cf045defe4aa297495d3b011ddc
 2020-07-21 09:36:18 +00:00
vichang
c52a84acf3 Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: Ibfa1c1e12f3f2c924f08ec2fa357d31cc0e8ecb7
 2020-07-21 09:22:44 +00:00
Anton Hansson
f7c2162913 Whitelist settings robotests to access wifi impl details 
The test is already accessing these via robolectric leaking the impl
jar, so make the dep explicit.

Note that the merged-in tag is unrelated to the actual change.

Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: Ic1a14c34334eb276724d97c4e763360d51cb035b
Change-Id: Id283ecb2b9b8bd087028f9a68604adc516e9ea9e
 2020-07-21 10:22:26 +01:00
vichang
85c56c1fa4 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I487392998a37248e6079ce86cb0f82fb853cf642
 2020-07-21 09:22:15 +00:00
vichang
3db0441e5c Merge "Remove the duplicated constant declaration in DateUtilsBridge" 2020-07-21 09:11:09 +00:00
TreeHugger Robot
c4cf30f7a3 Merge "Remove the watchdog's fd tracker." into rvc-dev-plus-aosp am: e7efdc9326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181445

Change-Id: Ibd35fd21e5f0ee5cffedd78e8f581a8bdaf43866
 2020-07-21 09:06:37 +00:00
vichang
6e706c4cee Merge changes from topic "DateIntervalFormat" 
* changes:
  Make a copy of DateIntervalFormat from libcore - part 2
  Make a copy of DateIntervalFormat from libcore
 2020-07-21 08:59:57 +00:00
TreeHugger Robot
e7efdc9326 Merge "Remove the watchdog's fd tracker." into rvc-dev-plus-aosp 2020-07-21 08:57:01 +00:00
Bill Yi
2414b21d4e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I991ffe8511741fa1cb216a7e2996dc99da0fb74e
 2020-07-20 23:07:56 -07:00
Automerger Merge Worker
6efa9a45e4 Merge "Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: 56e2b90936" into rvc-d1-dev-plus-aosp 2020-07-21 01:42:23 +00:00
Wale Ogunwale
a5c9aa0d0f Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: 56e2b90936 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: I61e803ecfed466bd8e55df057a8d98a72a880d79
 2020-07-21 01:42:01 +00:00
Wale Ogunwale
faa7063aaa Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: f4fb8c1457 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: Ib618bddd560576fe1d7bbf1b6a78f70b4733eac9
 2020-07-21 01:41:57 +00:00
Wale Ogunwale
56e2b90936 Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: I0707a8ab55eb3aa96b2f3107648db67f848256df
 2020-07-21 01:24:53 +00:00
Wale Ogunwale
f4fb8c1457 Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: Idda9ab4bb5dddc617eb61e4b3355567627ca6fd3
 2020-07-21 01:24:31 +00:00
Wale Ogunwale
309cfa3431 Merge "Prevent exception when surrounding text retrieval" into rvc-dev 2020-07-21 01:03:03 +00:00
Lucas Dupin
cf0396877a Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12193436

Change-Id: I872c16de139d1c096d75da659a33d9269afa765c
 2020-07-21 00:49:43 +00:00
Lucas Dupin
7e387342d6 Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev 2020-07-21 00:25:17 +00:00
Dave Mankoff
6331de5051 Don't turn on prox when wirelessly charging. 
Bug: 155373595
Fixes: 161699456
Test: atest SystemUITests && manual
Change-Id: If50ded7ca2836f49b40e71c5fb95c05b87e44213
 2020-07-20 20:09:34 -04:00
Automerger Merge Worker
0441a937ac Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: d7808d3dd9" into rvc-d1-dev-plus-aosp 2020-07-20 23:06:08 +00:00