Alison Cichowlas
2d3442466e
Do not restart activity when pinned set changes - just re-sort.
...
Bug: 145703939
Test: Share dialog via screenshot, long press for pin, observe behavior.
Change-Id: I6e9e03b77e1486093097ea1488fa589e3c7bd482
Merged-In: I6e9e03b77e1486093097ea1488fa589e3c7bd482
2019-12-18 02:40:02 +00:00
Automerger Merge Worker
b6349b363d
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933 am: 6231cffbb8 am: 18c0fbfacd
...
Change-Id: Ic8cde8755fe5fce355931efb735c7d90fb857817
2019-12-17 23:58:44 +00:00
Automerger Merge Worker
18c0fbfacd
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933 am: 6231cffbb8
...
Change-Id: I1653273a1d9c0eae7b8a8406bc188e2e909ffaa0
2019-12-17 23:43:26 +00:00
Automerger Merge Worker
6231cffbb8
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933
...
Change-Id: Ic625ffed3ce23a7766a12a153d9794a4abf7a6b5
2019-12-17 23:31:47 +00:00
Andrew Solovay
3e4f4f9933
Merge "docs: Fixed typo" into qt-dev
2019-12-17 23:20:29 +00:00
Automerger Merge Worker
de89306a0c
Merge "Remove PhoneStateLister#onOtaspChanged" am: 0d7a5dc2ea am: 6846fe997c
...
Change-Id: I8129f2a112daeb63e23535edb5155ceb85c2ece7
2019-12-17 21:28:32 +00:00
Meng Wang
6846fe997c
Merge "Remove PhoneStateLister#onOtaspChanged"
...
am: 0d7a5dc2ea
2019-12-17 13:25:04 -08:00
Meng Wang
0d7a5dc2ea
Merge "Remove PhoneStateLister#onOtaspChanged"
2019-12-17 21:14:06 +00:00
Automerger Merge Worker
b82174bc3a
docs: Removing most of the intro to PowerManager API am: 3fea8d1042 am: f92878e651 am: c06564375b
...
Change-Id: I9605f308953aabb49868763dbf5bfd66ac955bee
2019-12-17 20:32:46 +00:00
Automerger Merge Worker
c06564375b
docs: Removing most of the intro to PowerManager API am: 3fea8d1042 am: f92878e651
...
Change-Id: I07ea69318879ad5c70c99880c6cc6c57a348d76a
2019-12-17 20:18:50 +00:00
Automerger Merge Worker
f92878e651
docs: Removing most of the intro to PowerManager API am: 3fea8d1042
...
Change-Id: I25c41e4998197ef1df2c95fb1f2360360970389f
2019-12-17 19:58:53 +00:00
Automerger Merge Worker
f47a64b59d
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339
...
Change-Id: I263fbd69be70ccf48b0e16d00985e716060f6bfa
2019-12-17 19:20:16 +00:00
Peter Wang
a4c3162339
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant"
...
am: 23019528ec
2019-12-17 11:15:51 -08:00
Automerger Merge Worker
67da267f24
[DO NOT MERGE] Reset mTrackingReportedValues in endSample() am: 7293dfca7c
...
Change-Id: Ic79aa39d2578c4625c3e92e5ba46dde7df239b0e
2019-12-17 19:13:09 +00:00
Peter Wang
23019528ec
Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant"
2019-12-17 19:10:24 +00:00
Hui Yu
7e53cb7166
Merge "[DO NOT MERGE] Reset mTrackingReportedValues in endSample()" into qt-qpr1-dev
2019-12-17 19:01:15 +00:00
Automerger Merge Worker
5d836174d9
Merge "Add new configuration loading path for apex module Cronet" am: a960204edf am: d5f5adad39
...
Change-Id: I76afbbbb8df96f44749889573a1b1b5bc74aa07d
2019-12-17 16:20:16 +00:00
Luke Huang
d5f5adad39
Merge "Add new configuration loading path for apex module Cronet"
...
am: a960204edf
2019-12-17 08:03:49 -08:00
Luke Huang
5c4040ce24
Add new configuration loading path for apex module Cronet
...
Add an additional loading path which is used for libs permission
xml providing from Cronet apex module.
Bug: 145474221
Bug: 139397529
Test: build
Test: manual test with Cronet
Change-Id: I103539a45fe9182f84a79bfe45a6172d94068690
Merged-In: I02541eb2d4808d69ab8cb2d6a48cf8aaa39c86dc
2019-12-17 14:02:20 +00:00
Automerger Merge Worker
b53b1f67d6
Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline" am: e74c1f1278 am: fe520a7567
...
Change-Id: I03f3023ad48b2663c58234ede2deefd0ea80a881
2019-12-17 03:23:37 +00:00
Automerger Merge Worker
51e9a965a6
Merge "Resolve BluetoothA2dpSink APIs used by Settings" am: f14e2e1e1a am: 03942aba3b
...
Change-Id: Ibfc816fcdf1400d72dc00f14096d58c92e129485
2019-12-17 03:21:25 +00:00
Betty Chang
fe520a7567
Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline"
...
am: e74c1f1278
2019-12-16 19:10:15 -08:00
Rahul Sabnis
03942aba3b
Merge "Resolve BluetoothA2dpSink APIs used by Settings"
...
am: f14e2e1e1a
2019-12-16 19:07:57 -08:00
Betty Chang
e74c1f1278
Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline"
2019-12-17 02:53:41 +00:00
Treehugger Robot
f14e2e1e1a
Merge "Resolve BluetoothA2dpSink APIs used by Settings"
2019-12-17 02:31:59 +00:00
Automerger Merge Worker
92cc6eba5b
Merge "Refactor BluetoothPbap APIs used by Settings" am: a33dfe1e7b am: 7231799dbe
...
Change-Id: I6167bbc3c0cf1a725816dfb4b6ccfd0997fdc65c
2019-12-17 02:30:09 +00:00
Rahul Sabnis
7231799dbe
Merge "Refactor BluetoothPbap APIs used by Settings"
...
am: a33dfe1e7b
2019-12-16 17:57:01 -08:00
Treehugger Robot
a33dfe1e7b
Merge "Refactor BluetoothPbap APIs used by Settings"
2019-12-17 01:53:24 +00:00
Hui Yu
7293dfca7c
[DO NOT MERGE] Reset mTrackingReportedValues in endSample()
...
Otherwise, when next SamplingTimer.update() is called, it will take
zero as start time.
Bug: 142466892
Test: NA.
Change-Id: I04625fadd8fd8bab3ba83b8e7cd10737ad34e60b
(cherry picked from commit c7d49e01dd
2019-12-17 00:45:31 +00:00
Automerger Merge Worker
fb829df378
Merge "[RCS] Add IMS service into system service registry" am: 6a1d13f58e am: a962a65575
...
Change-Id: I61549d3d4da7ffdf5f2d497e52cd7a2fdd0f2c05
2019-12-17 00:10:51 +00:00
James Lin
a962a65575
Merge "[RCS] Add IMS service into system service registry"
...
am: 6a1d13f58e
2019-12-16 15:51:50 -08:00
James Lin
6a1d13f58e
Merge "[RCS] Add IMS service into system service registry"
2019-12-16 23:28:44 +00:00
Meng Wang
66972daf11
Remove PhoneStateLister#onOtaspChanged
...
and replace with Registrant in Phone, since the callback is only used
inside telephony.
Bug: 140908357
Test: make
Change-Id: Ia86e9885f85d7f6b3698e96653add00e9b8670ed
2019-12-16 15:10:43 -08:00
Andrew Solovay
b0c09e4ba6
docs: Fixed typo
...
Fixed a clear copy/paste error, docs had said "call getHeight() to
get the width" when it should have been "...to get the height".
Skipping staging since it's a simple text change.
Change-Id: Ic06557ac38517f409943585054835d774240ccf3
Test: make ds-docs
Exempt-from-owner-approval: Docs-only change
Bug: 144537947
2019-12-16 14:54:09 -08:00
Andrew Solovay
3fea8d1042
docs: Removing most of the intro to PowerManager API
...
The intro text says PowerManager is discouraged, and almost
all the available wakelock options have long been deprecated.
Given that, I think it makes sense to remove most of that
intro and just point devs to FLAG_KEEP_SCREEN_ON instead.
Staged to:
go/dac-stage/reference/android/os/PowerManager
Test: make ds-docs
Bug: 145699347
Change-Id: I517366903f3d9743166d7edaddc08471af0803d9
2019-12-16 22:05:12 +00:00
Automerger Merge Worker
c522c31070
[DO NOT MERGE] Add country blacklist support am: 97dad931df
...
Change-Id: Idfb887291164bd0962b1e78e2646a0d9ad6ad5ca
2019-12-16 21:54:20 +00:00
Automerger Merge Worker
1fa842bd68
Merge "expose APIs for mainline telephony-sdk" am: 0bc81e1d23 am: 91c9100315
...
Change-Id: I4990908923e76fade72928168ae40e200ea28409
2019-12-16 21:15:46 +00:00
Chen Xu
91c9100315
Merge "expose APIs for mainline telephony-sdk"
...
am: 0bc81e1d23
2019-12-16 12:58:06 -08:00
Chen Xu
0bc81e1d23
Merge "expose APIs for mainline telephony-sdk"
2019-12-16 20:51:04 +00:00
Alex Lin
97dad931df
[DO NOT MERGE] Add country blacklist support
...
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested
Change-Id: I21c146556e5406ecf5c72f74767ea8d5fc643aec
2019-12-16 12:30:39 -08:00
Automerger Merge Worker
053c87de7d
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi" am: 58ea8819f5 am: c825f758e5
...
Change-Id: I5758fa60f50c72fcf7b51e564e39cf5f9c821d23
2019-12-16 19:02:24 +00:00
yinxu
c825f758e5
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"
...
am: 58ea8819f5
2019-12-16 10:47:57 -08:00
David Su
0def143e45
Fix android.util.CloseGuard sample usage
...
Updated first sample with `Reference.reachabilityFence(this)`
to be consistent with the second sample.
Bug: 145831809
Test: none
Change-Id: I8c625de4f36a8cd52a3825021ff631db62f04662
2019-12-16 10:46:46 -08:00
Treehugger Robot
58ea8819f5
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"
2019-12-16 18:40:50 +00:00
Automerger Merge Worker
e3ba3689d9
Merge "Move RCS UCE out of Telephony Mainline" am: 07ba9c6fff am: 5a05ae1270
...
Change-Id: I57e27f7314692bbaa882216405deca80ded92ad1
2019-12-16 18:18:36 +00:00
Brad Ebinger
5a05ae1270
Merge "Move RCS UCE out of Telephony Mainline"
...
am: 07ba9c6fff
2019-12-16 09:59:23 -08:00
Brad Ebinger
07ba9c6fff
Merge "Move RCS UCE out of Telephony Mainline"
2019-12-16 17:53:31 +00:00
Automerger Merge Worker
ba109b3f30
Merge "Add aurimas as the owners of the android.annotation package" am: b65218c561 am: 001cf41de5
...
Change-Id: I20477b10ec559585e876388738539096992586d0
2019-12-16 14:43:29 +00:00
Jiyong Park
001cf41de5
Merge "Add aurimas as the owners of the android.annotation package"
...
am: b65218c561
2019-12-16 06:30:28 -08:00
Treehugger Robot
b65218c561
Merge "Add aurimas as the owners of the android.annotation package"
2019-12-16 14:25:59 +00:00
