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
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
Xin Li
816360a9b5 Merge ab/6692658 into stage-aosp-rvc-ts-dev 
Bug: 148878042
Merged-In: Ib6b5679f22901d2d9e7996e25b19318cc1916460
Change-Id: Ib8d508dd51391958ac12cc5b67a46c89f6703bf3
 2020-07-21 05:14:10 +00: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
TreeHugger Robot
e31b661b28 Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: d7808d3dd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452

Change-Id: I6e673aa38e72ea8674f674683abbbc335a5a568d
 2020-07-20 23:05:55 +00:00
TreeHugger Robot
2c4a768577 Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: 5cb5825c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452

Change-Id: Iae902863cd5c15be4f38d44447f68b62c4c7c9c1
 2020-07-20 23:05:38 +00:00
Kevin Hufnagle
56cd67c4e4 docs: Use more inclusive pronouns 
Change "his" to "their" in 2 places

Change-Id: Ib03e1967edd5d13f999c9290aabc56db33bf4fc0
Test: none (docs-only change)
Bug: 160937339
 2020-07-20 22:55:07 +00:00
TreeHugger Robot
d7808d3dd9 Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452

Change-Id: I10fd6d184a2bee9fa921b0d308a97ae749d8f101
 2020-07-20 22:52:11 +00:00
TreeHugger Robot
5cb5825c09 Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181452

Change-Id: I965e66fc83d9fad8ce0eb7f36072cbbf3343f380
 2020-07-20 22:51:57 +00:00
TreeHugger Robot
4daab7b2d6 Merge "Resume-on-Reboot: remove special string" into rvc-dev 2020-07-20 22:31:15 +00:00
Anton Hansson
4dec74e565 Add explicit dep on services.backup am: 7e7fc7201e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12194862

Change-Id: I6664349973e94ec09d883c0e81d96c1333737360
 2020-07-20 21:46:04 +00:00
Victor Chang
bbe4493efb Add vichang into OWNER of android.text.format 
Most android.text.format classes are wrappers of ICU4J or libcore.

Test: n/a
Change-Id: I3269efece738cfc7344d1823f7a79677f6cb93fc
 2020-07-20 21:17:48 +01:00
Victor Chang
55a6efbfd9 Remove @CorePlatformApi LocaleData usage in frameworks 
They can be replaced by the public API provided by ICU4J instead.
No extra layer of caching equivalent to the LocaleData cache is
added because ICU4J has caches instances, e.g. DateFormatSymbols,
etc.

Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I07048e0e1a4835d2744b7fce6a5ed79a112e456b
 2020-07-20 21:09:40 +01:00
Victor Chang
c744bd5f64 Use DateFormatSymbols directly instead of using LocaleData 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: Id5d70328ab146d439ed45135e0fa9d1b9cc95257
 2020-07-20 21:09:40 +01:00
Victor Chang
6a691eeec7 Remove the duplicated constant declaration in DateUtilsBridge 
Bug: 160606356
Test: m droid FrameworksCoreTests
Change-Id: Ifa79b2a29c6fc0c767337efe569da2d2ba29f959
 2020-07-20 21:09:40 +01:00
Victor Chang
3a3a8ada42 Make a copy of DateIntervalFormat from libcore - part 2 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I4c4253c707211f2a5ee0a11da107ab1dd6c4fab8
 2020-07-20 21:09:40 +01:00
Anton Hansson
7e7fc7201e 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
 2020-07-20 20:57:31 +01:00
Michael Wright
45a25dc11b Merge "Fix color mismatch of pointers" am: e1c169c983 am: 23ff2399a1 am: 6cddd8d6b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: Ie024c5215c9c192702c5b4be4ee392199969fdef
 2020-07-20 18:23:47 +00:00
Michael Wright
6cddd8d6b7 Merge "Fix color mismatch of pointers" am: e1c169c983 am: 23ff2399a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: I52a57b66d2651b8fed6f80740b3463feb0a5c928
 2020-07-20 18:06:50 +00:00
Michael Wright
23ff2399a1 Merge "Fix color mismatch of pointers" am: e1c169c983 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: I4a6d02a70131d3680b650db6f8feef4ef1add0ed
 2020-07-20 17:48:46 +00:00
Michael Wright
e1c169c983 Merge "Fix color mismatch of pointers" 2020-07-20 17:28:16 +00:00
SongFerngWang
a88f75d097 Add carrier config for NR timer reset 
KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL:
Whetherdevice reset all of NR timers when device camped on a
network that haven't 5G capability and RRC currently in IDLE state.

Bug: 160365713
Test: build pass.
Change-Id: I9802b8712798054a85307e549fb665bc85166311
Merged-In: I9802b8712798054a85307e549fb665bc85166311
 2020-07-20 12:59:30 +08:00
android-build-team Robot
408e00c407 Snap for 6692658 from c294687770 to rvc-release 
Change-Id: I538293eb83bf3caf72bc986d7aad9f6a385c1f1b
 2020-07-19 23:15:01 +00:00
TreeHugger Robot
76783bbe34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: d2d3a20624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d843553ee40c23594e18040a3da0ddd56591ff1
 2020-07-19 19:24:47 +00:00
TreeHugger Robot
b936f13c73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32a76f9fa31a3fc08a8b69595f9580a91f3b2596
 2020-07-19 19:14:27 +00:00
TreeHugger Robot
fdb56d01b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b15b8399e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5251f6cea71442ed6626be083ca790fcbb1fa98
 2020-07-19 19:14:16 +00:00
TreeHugger Robot
d2d3a20624 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
 2020-07-19 19:03:07 +00:00
TreeHugger Robot
fdd9fab0be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf9c22c9d05d16b653b32aa5fa48964709eeb250
 2020-07-19 19:02:51 +00:00
TreeHugger Robot
b15b8399e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-19 19:01:00 +00:00
yawanng
edd2c90631 EventSequenceValidator: Only record the debug log in debugging level. 
The stack trace log may confuse other developers and mistakenly points
to IORap as the bug cause.

cherry-pick from ef5e1a6dbe

Bug: 161145462
Test: Make and check the logcat.
Merged-In: I3cb24cace060cff381ab3c5770ff6c1c948a2d89
Change-Id: I3cb24cace060cff381ab3c5770ff6c1c948a2d89
 2020-07-19 11:55:16 -07:00
TreeHugger Robot
c294687770 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-19 18:49:45 +00:00
Automerger Merge Worker
8dfdcde143 Merge "Merge "AudioService: Add metrics for audio mode" into rvc-dev am: 148c8bc210 am: 8eae5a9c67" into rvc-d1-dev-plus-aosp 2020-07-19 17:21:51 +00:00
Eric Laurent
f332fc9ccd Merge "AudioService: Add metrics for audio mode" into rvc-dev am: 148c8bc210 am: e502c6aa15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065323

Change-Id: I56e742e32df8681d474ae0b64d184e97fb4567e3
 2020-07-19 17:21:43 +00:00
Eric Laurent
31f98db10e Merge "AudioService: Add metrics for audio mode" into rvc-dev am: 148c8bc210 am: 8eae5a9c67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065323

Change-Id: Ib5bef061552039a473552f7f2ca3617ed876a4be
 2020-07-19 17:21:33 +00:00
Eric Laurent
e502c6aa15 Merge "AudioService: Add metrics for audio mode" into rvc-dev am: 148c8bc210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065323

Change-Id: I0c64ec09a72ccf1c781b5652a1cc36508062083c
 2020-07-19 17:08:41 +00:00
Eric Laurent
8eae5a9c67 Merge "AudioService: Add metrics for audio mode" into rvc-dev am: 148c8bc210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065323

Change-Id: I7ba806f49fc9cb3b61b4de8e9a265db2044f13a8
 2020-07-19 17:08:28 +00:00
Eric Laurent
148c8bc210 Merge "AudioService: Add metrics for audio mode" into rvc-dev 2020-07-19 16:46:20 +00:00
Bill Yi
c759295063 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I626e20f4aa818a4ecb66a22b0438b4759a7512a4
 2020-07-19 09:14:58 -07:00
Bill Yi
f797890c09 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6b5679f22901d2d9e7996e25b19318cc1916460
 2020-07-19 08:54:49 -07:00
TreeHugger Robot
8d9d5c6fed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: a1f3c2d016 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7b618c8c12b7bc09e06e061ecdb062898fafe62
 2020-07-19 15:16:46 +00:00