OSDN Git Service
Peter Wang [Mon, 28 Oct 2019 23:25:43 +0000 (16:25 -0700)]
[automerger skipped] Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9 am:
4dd1013a04 am:
8f6945f47b
am:
20c679d182 -s ours
am skip reason: change_id I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183 with SHA1
fac73bd00b is in history
Change-Id: If5a28c518c58ecdabc87947555ed1a61d090c7af
Peter Wang [Mon, 28 Oct 2019 23:25:31 +0000 (16:25 -0700)]
[automerger skipped] Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6 am:
aeeff0287c am:
20c9b8e520
am:
d3c5ae687e -s ours
am skip reason: change_id I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803 with SHA1
406cee2b72 is in history
Change-Id: I97fb222360b4086100e9b7c88db71e045f29f0b7
Peter Wang [Mon, 28 Oct 2019 23:19:04 +0000 (16:19 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9 am:
4dd1013a04
am:
8f6945f47b
Change-Id: Id4b990a8107da649f2e59efb62ea9431e1e4179a
Peter Wang [Mon, 28 Oct 2019 23:18:55 +0000 (16:18 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6 am:
aeeff0287c
am:
20c9b8e520
Change-Id: I2fac1ba6f9740c28b11c352c4b06c4b91ba303b1
Peter Wang [Mon, 28 Oct 2019 23:06:02 +0000 (16:06 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9
am:
4dd1013a04
Change-Id: Idbdcc5b47bddaa577113843c4fde7f0115428935
Peter Wang [Mon, 28 Oct 2019 23:05:52 +0000 (16:05 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6
am:
aeeff0287c
Change-Id: I1bb12eaca6f0efffd728be1d7e9c6d3d2fa9efa8
Peter Wang [Mon, 28 Oct 2019 22:58:57 +0000 (15:58 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
am:
10d6f20bc9
Change-Id: I0acfb85416f42fd570297554a0ce231a12914649
Peter Wang [Mon, 28 Oct 2019 22:58:49 +0000 (15:58 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
am:
8db38c9ef6
Change-Id: I55feb7a5515aa05dea0b5482f6d84b67c6686948
Jack Yu [Mon, 28 Oct 2019 22:58:48 +0000 (15:58 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1 am:
614b2ca5ef am:
3036bcf628
am:
3998e15d17
Change-Id: I0c1fa7ce4aa469a46fd6dcdd12ebfb614c138664
Jack Yu [Mon, 28 Oct 2019 22:52:00 +0000 (15:52 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1 am:
614b2ca5ef
am:
3036bcf628
Change-Id: I6ebde4a89a44879865e198e5be14e9f6a49f67b5
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
Jack Yu [Mon, 28 Oct 2019 22:38:44 +0000 (15:38 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1
am:
614b2ca5ef
Change-Id: I153131c15ed3890e259aa156b185c2a36fd12f26
Rubin Xu [Mon, 28 Oct 2019 22:29:59 +0000 (22:29 +0000)]
Merge "Handle the case when KeyChain binding fails"
Jack Yu [Mon, 28 Oct 2019 22:26:01 +0000 (15:26 -0700)]
Merge "Add new carrier configuration for GET INPUT command"
am:
48ad8828d1
Change-Id: Ib9dc938b2dcaa069fdca20f72c9eacb7d60356c7
Jack Yu [Mon, 28 Oct 2019 22:06:43 +0000 (22:06 +0000)]
Merge "Add new carrier configuration for GET INPUT command"
Selim Cinek [Mon, 28 Oct 2019 21:06:35 +0000 (14:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev am:
39195ba211
am:
db59aba594 -s ours
am skip reason: subject contains skip directive
Change-Id: I178eca4ce0739bfbc2d49c0f85654dc14a805a93
Selim Cinek [Mon, 28 Oct 2019 21:06:29 +0000 (14:06 -0700)]
[automerger skipped] DO NOT MERGE Revert all scrim related changes in qpr am:
f97d7f73cf
am:
df1a2a031d -s ours
am skip reason: subject contains skip directive
Change-Id: I69e1ea1816d2e3c492d8190884b0a7104a295fb7
Selim Cinek [Mon, 28 Oct 2019 20:51:55 +0000 (13:51 -0700)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
am:
39195ba211
Change-Id: Ib8f292c600dae30fc160ab3ab00b188773e911e5
Selim Cinek [Mon, 28 Oct 2019 20:51:49 +0000 (13:51 -0700)]
DO NOT MERGE Revert all scrim related changes in qpr
am:
f97d7f73cf
Change-Id: I283806af08af94d90408761e318285c9c725bf55
Peter Wang [Mon, 28 Oct 2019 20:33:55 +0000 (13:33 -0700)]
[automerger skipped] Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08 am:
a0b42289aa am:
479a640a72
am:
bd0295df59 -s ours
am skip reason: change_id Ib8496ed6dbc6179940892de8df7901e84dd67d76 with SHA1
0c1297b2d7 is in history
Change-Id: I867cb82dea341aa0eadd24fdca13e03f5d40cb6c
Selim Cinek [Mon, 28 Oct 2019 20:31:41 +0000 (20:31 +0000)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
Peter Wang [Mon, 28 Oct 2019 20:21:48 +0000 (13:21 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08 am:
a0b42289aa
am:
479a640a72
Change-Id: Ica15801fe3b348964f975405e859f8f7b86a6938
TreeHugger Robot [Mon, 28 Oct 2019 20:18:12 +0000 (20:18 +0000)]
Merge "Fix permission issue during LockSettingsService.dump()"
Peter Wang [Mon, 28 Oct 2019 20:08:44 +0000 (13:08 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08
am:
a0b42289aa
Change-Id: I20870973a273324dc477dd66af36df0f8d11f880
Peter Wang [Mon, 28 Oct 2019 19:54:27 +0000 (12:54 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
am:
ca01a7ee08
Change-Id: If8018a82a3891649cb7a23e5631cf77de6547da6
Peter Wang [Tue, 22 Oct 2019 18:36:42 +0000 (11:36 -0700)]
Fixed java doc for EuiccService#eraseSubscriptions
Bug:
143138878
Test: on device
Change-Id: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Merged-In: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Peter Wang [Wed, 23 Oct 2019 18:14:46 +0000 (11:14 -0700)]
Fix java doc for eraseSubscriptionsWithOptions
Bug:
143138878
Test: on device
Change-Id: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
Merged-In: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
shubang [Mon, 28 Oct 2019 19:32:38 +0000 (12:32 -0700)]
Merge "Add owners for TV related files" am:
149ad21fcd am:
f404deba46 am:
9fa2d436c1
am:
163e1565d9
Change-Id: I5bbb1693767e9a88c06d512e2392a1c37ab5f2dd
Peter Wang [Mon, 28 Oct 2019 19:32:18 +0000 (19:32 +0000)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
shubang [Mon, 28 Oct 2019 19:25:31 +0000 (12:25 -0700)]
Merge "Add owners for TV related files" am:
149ad21fcd am:
f404deba46
am:
9fa2d436c1
Change-Id: I1aceace24f73aeaca194ffccb5603994fc155c24
shubang [Mon, 28 Oct 2019 19:18:30 +0000 (12:18 -0700)]
Merge "Add owners for TV related files" am:
149ad21fcd
am:
f404deba46
Change-Id: Ie4d09f453d97cabfb406d92c4700a36a2e83089f
shubang [Mon, 28 Oct 2019 19:11:27 +0000 (12:11 -0700)]
Merge "Add owners for TV related files"
am:
149ad21fcd
Change-Id: I1216f9a8c53659e53e1649d0e7898de14c4e4c1e
Treehugger Robot [Mon, 28 Oct 2019 18:40:38 +0000 (18:40 +0000)]
Merge "Add owners for TV related files"
Varun Shah [Mon, 28 Oct 2019 18:03:52 +0000 (18:03 +0000)]
Merge "Remove XML write functions from UsageStats."
Sunil Ravi [Mon, 28 Oct 2019 18:03:19 +0000 (18:03 +0000)]
Merge "wifi: Change WIFI_FEATURE_XXX type from int to long"
Varun Shah [Mon, 28 Oct 2019 18:03:07 +0000 (18:03 +0000)]
Merge "Catch exceptions when reading SyncStatusInfo."
Lucas Dupin [Mon, 28 Oct 2019 16:23:13 +0000 (16:23 +0000)]
Merge "Revert "Move DozeServiceHost out of StatusBar.""
TreeHugger Robot [Mon, 28 Oct 2019 14:39:43 +0000 (14:39 +0000)]
Merge changes Ieb8a9aee,Iee308af4
* changes:
Finer-grain control of people sorting via plugin
Unit tests for PeopleHubViewController.kt
Bill Yi [Mon, 28 Oct 2019 14:31:12 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Jiyong Park [Mon, 28 Oct 2019 12:32:10 +0000 (05:32 -0700)]
[automerger skipped] Merge "Replace framework.jar with framework-minus-apex.jar" am:
df5cd39198 am:
8529d01c84 am:
af51e9e5fd
am:
7e4fff0d6c -s ours
am skip reason: change_id Ia12d5984b011a54bd8ef708d0f552298a6ddec8a with SHA1
911cd4faf8 is in history
Change-Id: Ib5e333b2625f9b78e67717ef75d635465218cfa4
Jiyong Park [Mon, 28 Oct 2019 12:25:57 +0000 (05:25 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar" am:
df5cd39198 am:
8529d01c84
am:
af51e9e5fd
Change-Id: Ic23f6231a097bb52264fa66d787a64088a5379f2
Jiyong Park [Mon, 28 Oct 2019 12:19:59 +0000 (05:19 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar" am:
df5cd39198
am:
8529d01c84
Change-Id: Ie32e9bfd0f20c73dd4577255eb4a2eb0c0f2d9e5
Jiyong Park [Mon, 28 Oct 2019 12:13:57 +0000 (05:13 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar"
am:
df5cd39198
Change-Id: Ic2b5961baa0fb7d80f4cf69e4255377f3f42b6fc
Treehugger Robot [Mon, 28 Oct 2019 11:40:09 +0000 (11:40 +0000)]
Merge "Replace framework.jar with framework-minus-apex.jar"
Riddle Hsu [Mon, 28 Oct 2019 10:36:52 +0000 (10:36 +0000)]
Merge "Remove token behind fullscreen activity from unknown visibility"
Jiyong Park [Mon, 28 Oct 2019 06:33:08 +0000 (15:33 +0900)]
Replace framework.jar with framework-minus-apex.jar
framework.jar is now a build-time only library which has private symbols
from framework-minus-apex.jar and public symbols from APEXes. Instead of
framework.jar, framework-minus-apex.jar is installed to the device.
framework-minus-apex is installed as framework.jar because the name is
pretty widespread throughout Android. Keeping the original file name for
the backwards compatibility.
Bug:
139391334
Test: m, inspect the build system.img and check that
system/framework/framework.jar exists
Merged-In: Ia12d5984b011a54bd8ef708d0f552298a6ddec8a
(cherry picked from commit
617a16478b0f5875084e339553b7b96f3a292e03)
Change-Id: I30d5c789c1d67cac7dfe6339f244e66af5114767
TreeHugger Robot [Mon, 28 Oct 2019 05:56:11 +0000 (05:56 +0000)]
Merge "Replace framework.jar with framework-minus-apex.jar"
Sunil Ravi [Fri, 25 Oct 2019 20:41:47 +0000 (13:41 -0700)]
wifi: Change WIFI_FEATURE_XXX type from int to long
This change is to avoid issues in assigning signed integer
feature (WIFI_FEATURE_DPP) to long featureSet. The
assignement was resulting in large, signed integer.
Bug:
143363031
Test: atest com.android.wifi.server
Test: Wifi ON/OFF, Connect and data transfer
Test: Added logs and verified feature set saved in iface.
Change-Id: Ic3828e675e49a8c1628368a7e6cf7f01e420bd96
Riddle Hsu [Sat, 5 Oct 2019 15:10:15 +0000 (23:10 +0800)]
Remove token behind fullscreen activity from unknown visibility
When launching activity while keyguard is locked, their window tokens
will be added into unknown visibility controller to smooth the transition.
But if there are multiple starting activities without attached process,
only the last started activity will be resumed. Then the prior activities
are left in unknown visibility and cause transition timeout.
It is resolved by removing the unknown visibility records that won't be
visible when resuming top activity. Also consolidate shouldBeVisible and
shouldBeVisibleIgnoringKeyguard to reduce duplicated checking.
Bug:
123540470
Bug:
141826987
Test: atest ActivityStackTests# \
testClearUnknownAppVisibilityBehindFullscreenActivity
Change-Id: Ie6d11e856a2b81a39222a0d96644712ce8ddf955
Louis Chang [Mon, 28 Oct 2019 01:02:41 +0000 (01:02 +0000)]
Merge "Refactor start activity methods"
Wale Ogunwale [Sun, 27 Oct 2019 18:42:52 +0000 (18:42 +0000)]
Merge "Clean-up ActivityRecord reparenting/adding to Task (57/n)"
Jack Yu [Sun, 27 Oct 2019 07:58:05 +0000 (00:58 -0700)]
Merge "Change Wi-Fi Calling text for SFR France" am:
fde6b837f9 am:
59e26de2dc am:
edd7fac562
am:
6afb19b807
Change-Id: I310788c1417e60c111fc58b614b15176166fb59f
Jack Yu [Sun, 27 Oct 2019 07:51:20 +0000 (00:51 -0700)]
Merge "Change Wi-Fi Calling text for SFR France" am:
fde6b837f9 am:
59e26de2dc
am:
edd7fac562
Change-Id: I5f8a1c47540c516889f5f64ff5a96861de93906a
Jack Yu [Sun, 27 Oct 2019 07:44:30 +0000 (00:44 -0700)]
Merge "Change Wi-Fi Calling text for SFR France" am:
fde6b837f9
am:
59e26de2dc
Change-Id: Ica630635e45e341374fa7cd7b9b657ebb20f6eec
Jack Yu [Sun, 27 Oct 2019 07:37:20 +0000 (00:37 -0700)]
Merge "Change Wi-Fi Calling text for SFR France"
am:
fde6b837f9
Change-Id: Idcc90f493b09f6254fac47848147613b2394b735
Jack Yu [Sun, 27 Oct 2019 07:20:47 +0000 (07:20 +0000)]
Merge "Change Wi-Fi Calling text for SFR France"
Xin Li [Sun, 27 Oct 2019 06:57:10 +0000 (23:57 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am:
b2198fa670 -s ours am:
a958184a31 -s ours am:
058be5620e -s ours
am:
2b829de637 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: If4bd1b3709a7d24734dfb4eafbc21e7f294e9358
Xin Li [Sun, 27 Oct 2019 06:37:31 +0000 (23:37 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master am:
d3498e3053 -s ours am:
77bd54bc6c -s ours am:
7e2bffda1a -s ours
am:
a4fdeff033 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: Ibc38a7a0e37a1526ca1c241144617cd6d7dde54e
Xin Li [Sun, 27 Oct 2019 06:37:24 +0000 (23:37 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am:
b2198fa670 -s ours am:
a958184a31 -s ours
am:
058be5620e -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: Icfa7beee770f4c12e91c988f894490bb7d8fbb00
Xin Li [Sun, 27 Oct 2019 06:17:41 +0000 (23:17 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master am:
d3498e3053 -s ours am:
77bd54bc6c -s ours
am:
7e2bffda1a -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I87564c9f2362dac792b4e4b9181e1da58ce23bdc
Xin Li [Sun, 27 Oct 2019 06:14:13 +0000 (23:14 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am:
b2198fa670 -s ours
am:
a958184a31 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I92eabc9cf3b76c39eab3cbd1a79572dc34ca0a5e
Xin Li [Sun, 27 Oct 2019 05:54:18 +0000 (22:54 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am:
b2198fa670 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I4584fa1059ebb28808a5e0acf4bfcfe07cf306dd
Xin Li [Sun, 27 Oct 2019 05:52:31 +0000 (22:52 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master am:
d3498e3053 -s ours
am:
77bd54bc6c -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I1f5642c629d23736b0490520f85988a97e8b4d07
Xin Li [Sun, 27 Oct 2019 05:33:13 +0000 (22:33 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master
am:
d3498e3053 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I69195e1645a0fd74c3919ab55ff1c171fb51deaf
Xin Li [Sun, 27 Oct 2019 04:44:29 +0000 (04:44 +0000)]
Merge "Merge Coral/Flame into AOSP master"
Wale Ogunwale [Sun, 13 Oct 2019 21:00:40 +0000 (23:00 +0200)]
Clean-up ActivityRecord reparenting/adding to Task (57/n)
- Updated Configuration#onParentChanged to take params newParent and
oldParent to make logic of reparenting less complex to deal with in
classes that extend.
- Introduced WindowContainer#reparent to consolidate reparenting logic
and also allow us to only set onParentChanged once for the operation.
- Simplfied logic flow around adding/remove/reparenting activity to
task by using methods like addChild(), onChildAdded(), and such.
- Removed Task.mDeferRemoval which no longer makes sense and was leading
to task and stack leaks.
Bug:
80414790
Test: Existing tests pass
Change-Id: I4ffa79a1c731dc137213bdd3d7f04b8f013decc4
Bill Yi [Sun, 27 Oct 2019 03:51:04 +0000 (20:51 -0700)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours am:
0079161fcd -s ours
am:
44bbac546c -s ours
am skip reason: subject contains skip directive
Change-Id: Idd9b5d23a8e2d851135ffaba8c71e5bb6dc1a1e8
Bill Yi [Sun, 27 Oct 2019 03:48:32 +0000 (20:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours am:
b9b2241edb -s ours
am:
4abe52e1ef -s ours
am skip reason: subject contains skip directive
Change-Id: I3ba6f3113410ecf458c1f2c78d932795832ed760
Bill Yi [Sun, 27 Oct 2019 03:45:52 +0000 (20:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
9ee6503731 -s ours
am:
e0b35431ed -s ours
am skip reason: subject contains skip directive
Change-Id: I54d0b913314cc677568a0db8d42aeaae6477333d
Android Build Merger (Role) [Sun, 27 Oct 2019 03:40:28 +0000 (03:40 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours am:
0079161fcd -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 27 Oct 2019 03:39:50 +0000 (20:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours
am:
0079161fcd -s ours
am skip reason: subject contains skip directive
Change-Id: Ieaca9606d48147c73b59e3a8cbf0d1a2487bdfdf
Bill Yi [Sun, 27 Oct 2019 03:39:49 +0000 (20:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours
am:
b9b2241edb -s ours
am skip reason: subject contains skip directive
Change-Id: I3a3a9a303f6fb64c8868b85f8e8a8f4393ab1eff
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3447b7b66c -s ours
am skip reason: subject contains skip directive
Change-Id: I27f768b2628d15630a15159e642fd89d51be8b83
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3447b7b66c -s ours
am skip reason: subject contains skip directive
Change-Id: I6ebc14c249ca0cc77783c63c0acf9a1738349010
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9ee6503731 -s ours
am skip reason: subject contains skip directive
Change-Id: I2aa30b88211dc6211db8494cbb249930b2c48790
Bill Yi [Sun, 27 Oct 2019 00:48:31 +0000 (17:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f4a4c0efd8c96693ec5700c13a95e4dc0fa4240
Auto-generated-cl: translation import
Bill Yi [Sun, 27 Oct 2019 00:38:28 +0000 (17:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2407d77349f697484f62cf943f5960381ffc76ae
Auto-generated-cl: translation import
Roshan Pius [Sun, 27 Oct 2019 00:09:50 +0000 (00:09 +0000)]
Merge "Add a new BatteryStatsManager class"
Bill Yi [Sat, 26 Oct 2019 21:59:39 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40ac00c35f8441b358633641eb11036e4216c12e
Auto-generated-cl: translation import
Roshan Pius [Fri, 11 Oct 2019 20:44:00 +0000 (13:44 -0700)]
Add a new BatteryStatsManager class
Wifi/telephony mainline modules uses IBatteryStats which is an AIDL &
hence cannot be made a @SystemApi. Create a new manager class to wrap
around this AIDL to expose @System Api.
Bug:
138806762
Test: Device boots up & connects to wifi networks.
Change-Id: Ib8816c3df17ccc562b9664e7bea1ef01ab61f697
Ian Kasprzak [Sat, 26 Oct 2019 20:52:35 +0000 (13:52 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping." am:
1490293aa2 -s ours am:
14b9349ac8 -s ours am:
a3138f4183 -s ours
am:
8bfabe1c31 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
a2eedd5d99 is in history
Change-Id: I8f4cfc04223de687869aab78ae4c518049a7df18
Ian Kasprzak [Sat, 26 Oct 2019 20:45:11 +0000 (13:45 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping." am:
1490293aa2 -s ours am:
14b9349ac8 -s ours
am:
a3138f4183 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
b01ef14470 is in history
Change-Id: Icbc53948986eb30f6110af4ee3316f04b233db44
Ian Kasprzak [Sat, 26 Oct 2019 20:39:12 +0000 (13:39 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping." am:
1490293aa2 -s ours
am:
14b9349ac8 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
b01ef14470 is in history
Change-Id: I7f8e1f3385ed3e8e0d8853c5de1bf66b1dbf1137
Ian Kasprzak [Sat, 26 Oct 2019 20:26:48 +0000 (13:26 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping."
am:
1490293aa2 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
3495d4f857 is in history
Change-Id: I057dbe58792ccbf0a254a65f17da4b6739a6fbd6
Ian Kasprzak [Sat, 26 Oct 2019 20:07:34 +0000 (20:07 +0000)]
Merge "Ignore FlakyTests in test-mapping."
Yoshiaki Naka [Thu, 21 Feb 2019 09:40:03 +0000 (18:40 +0900)]
Add new carrier configuration for GET INPUT command
The characters 0 to 9, *, # and + are accepted in the digit only mode of
GET INPUT/INKEY commands according to the 3GPP/ETSI standard, but only
numeric charactrers 0 to 9 are used in some actual use-cases. It must be
confusing to display all the allowed characters including *, # and + as
the helper text on the input screen in that case, so whether to display
the allowed characters must be configurable.
Bug:
128890104
Test: Confirmed the expected behavior in manual test cases.
Change-Id: I97ed3dd538c55f48eb05dad96e4836a48a295675
Selim Cinek [Sat, 26 Oct 2019 00:37:00 +0000 (17:37 -0700)]
DO NOT MERGE Revert all scrim related changes in qpr
This reverts commit
9449cfc4a608e7d801da642958249a16c536411b.
This reverts commit
22fa97577f39524e3ffbfbbf37040eff540bcb49.
This reverts commit
bde48202e7bb1ffa04acd5c42a332c62b73f34d8.
Bug:
141649119
Bug:
143195895 is also fixed on my taimen with the above.
Bug:
143185828
Test: atest SystemUITests
Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad
Marco Nelissen [Sat, 26 Oct 2019 02:30:22 +0000 (19:30 -0700)]
[automerger skipped] Merge "Move Visualizer to libaudioeffect_jni, its only user" am:
0bf6a04b0b am:
70a9524cfb am:
828ef837a7
am:
71dec64047 -s ours
am skip reason: change_id I23902cd1cc16b49200f41f79736683c89b9f86f8 with SHA1
10c9b0f9c0 is in history
Change-Id: I8de5ebba1b0915fdb1fc0f6535bc8218e891742b
Marco Nelissen [Sat, 26 Oct 2019 02:23:44 +0000 (19:23 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user" am:
0bf6a04b0b am:
70a9524cfb
am:
828ef837a7
Change-Id: Ifc5e0139293b4bd56af1feca54bd4cb59848a787
Marco Nelissen [Sat, 26 Oct 2019 02:16:47 +0000 (19:16 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user" am:
0bf6a04b0b
am:
70a9524cfb
Change-Id: If5b4690d49a2d86021f7e32ca6c016341020342d
Marco Nelissen [Sat, 26 Oct 2019 02:10:06 +0000 (19:10 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user"
am:
0bf6a04b0b
Change-Id: Ic5c85e1109121c247d1be0fd76b48300a953ff23
Marco Nelissen [Sat, 26 Oct 2019 01:45:57 +0000 (01:45 +0000)]
Merge "Move Visualizer to libaudioeffect_jni, its only user"
Kevin Chyn [Sat, 26 Oct 2019 00:37:10 +0000 (00:37 +0000)]
Merge changes Idd1f2b2b,I6a46bb2f,Ibdf7c175
* changes:
Move the animation delay for credential UI up one layer
Animate height animator together with the rest of the AnimatorSet
Temporarily do not remove biometric view when animating to credential
Ian Kasprzak [Fri, 25 Oct 2019 23:46:06 +0000 (16:46 -0700)]
Ignore FlakyTests in test-mapping.
(Merged-In tag to prevent merging to qt-r1-dev-plus-aosp and downstream)
Test: N/A
Bug:
142395610
Change-Id: Ib7b9aab429b59fa1fcd9638f4733147a17cbd4ef
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
Oscar Shu [Sat, 26 Oct 2019 00:12:44 +0000 (00:12 +0000)]
Merge "BssidBlocklistMonitor proto changes"
Hui Yu [Tue, 22 Oct 2019 22:35:53 +0000 (15:35 -0700)]
Do not print Intent ClipData in logcat/dumpsys output.
Change-Id: I7472248777bcff01a8db3be707c19dfab098213a
Fix:
142834800
Test: the reproduce steps in b/
142834800
John Reck [Fri, 25 Oct 2019 22:28:40 +0000 (22:28 +0000)]
Merge "Delete VectorDrawableAtlas"
Roshan Pius [Fri, 25 Oct 2019 21:57:56 +0000 (21:57 +0000)]
Merge "WifiStack: Grant READ_DEVICE_CONFIG permission to wifi"
Peter Wang [Mon, 9 Sep 2019 20:57:41 +0000 (13:57 -0700)]
Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug:
139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76