Winson Chung
8ad0f36017
Merge "Disable color sampling while navigation bar is hidden" into qt-dev
...
am: 0eefbef6bb
2019-06-19 22:52:11 -07:00
TreeHugger Robot
0eefbef6bb
Merge "Disable color sampling while navigation bar is hidden" into qt-dev
2019-06-20 05:11:20 +00:00
Stanislav Zholnin
de53fe5545
Merge "Change dangerous permission log order. https://cs.corp.google.com/piper///depot/google3/logs/proto/wireless/android/stats/platform/westworld/atoms.proto?rcl=253705450&g=0&l=2989 the items in proto is different from what's in the logs." into qt-dev
...
am: 10c6723386
2019-06-19 21:37:14 -07:00
Stanislav Zholnin
10c6723386
Merge "Change dangerous permission log order. https://cs.corp.google.com/piper///depot/google3/logs/proto/wireless/android/stats/platform/westworld/atoms.proto?rcl=253705450&g=0&l=2989 the items in proto is different from what's in the logs." into qt-dev
2019-06-20 03:52:30 +00:00
Xiangyu/Malcolm Chen
37661a2ead
[automerger skipped] Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." am: e7418497c4
...
am: bcf39bac196499e6d95b
2019-06-19 20:43:59 -07:00
Xiangyu/Malcolm Chen
bc381e5fc1
[automerger skipped] Merge "Triggering notifications when dual CDMA SIM combinations are detected" am: be0d8fc39b
...
am: 939aef288a034cb343a1
2019-06-19 20:30:35 -07:00
Eugene Susla
571b3bdf37
Merge "[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService" into qt-dev
...
am: c056428db2
2019-06-19 20:26:57 -07:00
Eugene Susla
aae1c818e2
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
am: 45fcf147c1
2019-06-19 20:26:50 -07:00
Xiangyu/Malcolm Chen
bcf39bac19
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached."
...
am: e7418497c4
2019-06-19 20:20:53 -07:00
Xiangyu/Malcolm Chen
939aef288a
Merge "Triggering notifications when dual CDMA SIM combinations are detected"
...
am: be0d8fc39b
2019-06-19 20:12:29 -07:00
TreeHugger Robot
c056428db2
Merge "[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService" into qt-dev
2019-06-20 02:58:21 +00:00
Xiangyu/Malcolm Chen
e7418497c4
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached."
2019-06-20 02:28:02 +00:00
Xiangyu/Malcolm Chen
be0d8fc39b
Merge "Triggering notifications when dual CDMA SIM combinations are detected"
2019-06-20 02:27:35 +00:00
Philip P. Moltmann
383a69c01f
Merge "Propagate whitelisted perms during install" into qt-dev
...
am: ddaa6e5943
2019-06-19 19:16:35 -07:00
Hall Liu
302a2ecb05
Merge "Update documentation for TelephonyManager#getImei" into qt-dev
...
am: 6d574ed355
2019-06-19 19:14:06 -07:00
Makoto Onuki
0e9303f398
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev
...
am: 71acb72cbd
2019-06-19 19:11:02 -07:00
Eugene Susla
45fcf147c1
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
Fixes: 135355306
Test: presubmit
Change-Id: I78d9840a9d7e04cd373c967b259a614990153841
2019-06-20 01:50:48 +00:00
Sunny Goyal
f3ede32617
Merge "Using correct slop for checking quickstep gesture" into qt-dev
...
am: 6f72636bb6
2019-06-19 18:38:16 -07:00
TreeHugger Robot
ddaa6e5943
Merge "Propagate whitelisted perms during install" into qt-dev
2019-06-20 01:28:56 +00:00
Hall Liu
6d574ed355
Merge "Update documentation for TelephonyManager#getImei" into qt-dev
2019-06-20 00:44:39 +00:00
Summer Jiang
a652e2715f
Change dangerous permission log order.
...
https://cs.corp.google.com/piper///depot/google3/logs/proto/wireless/android/stats/platform/westworld/atoms.proto?rcl=253705450&g=0&l=2989
the items in proto is different from what's in the logs.
Test: tested on device using testdrive (statsd_testdrive 10050)
Change-Id: I886ef4ff8d681b0a7b8aa068171f367122a92e99
Bug: 135637139
2019-06-19 23:45:53 +00:00
Makoto Onuki
71acb72cbd
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev
2019-06-19 23:24:04 +00:00
TreeHugger Robot
6f72636bb6
Merge "Using correct slop for checking quickstep gesture" into qt-dev
2019-06-19 23:06:52 +00:00
Malcolm Chen
aa3512ba9c
Make sure on non-dds phone, try MMS data connection when PS is not
...
attached.
Before setting up data connection, we check if it's on non-dds and
voice is registered on non-LTE network, if true we'll setup the data
connection even if it's not attached.
Bug: 134086103
Test: manual
Change-Id: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
Merged-In: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
2019-06-19 23:01:49 +00:00
Malcolm Chen
56ea64d703
Triggering notifications when dual CDMA SIM combinations are detected
...
Define dual CDMA SIM combination extras.
Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.
Change-Id: I5caf39478dd0814aa1b2def801b1c3a107355682
Merged-In: I5caf39478dd0814aa1b2def801b1c3a107355682
2019-06-19 22:48:08 +00:00
Wonsik Kim
88cb99b1be
Merge "media: keep JMediaCodec::mCodec reference until destruction" into qt-dev
...
am: 8a1174bc94
2019-06-19 15:45:57 -07:00
Bill Yi
f9b60aee53
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: bc73f723af
2019-06-19 15:42:34 -07:00
TreeHugger Robot
8a1174bc94
Merge "media: keep JMediaCodec::mCodec reference until destruction" into qt-dev
2019-06-19 22:19:28 +00:00
Android Build Merger (Role)
1ee7c181d1
Merge "Merge "Add config to control full task snapshot scale" into qt-dev am: 10b9def7cb" into qt-dev-plus-aosp
2019-06-19 22:06:45 +00:00
Tim Joines
2b9196611e
Merge "Add config to control full task snapshot scale" into qt-dev
...
am: 10b9def7cb
2019-06-19 15:03:46 -07:00
Eric Holk
7192be9d24
Merge "[startop] Add an app for testing startup performance" am: e563643312
...
am: 58ed47d87b
2019-06-19 15:03:36 -07:00
TreeHugger Robot
bc73f723af
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-19 22:03:03 +00:00
Sunny Goyal
4774c337d9
Merge "Fixing wrong arguments used for permission check" into qt-dev
...
am: fa54e4b62a
2019-06-19 14:58:57 -07:00
Philip P. Moltmann
271551fc81
Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev
...
am: bf5506b240
2019-06-19 14:48:34 -07:00
Philip P. Moltmann
63a68fcb8b
Also trigger PermPolicySvc on app-ops changes
...
am: fad1a8fb2f
2019-06-19 14:48:18 -07:00
Philip P. Moltmann
06f9adca25
Combine successive PermPolicySvc syncs
...
am: 78c155b8a4
2019-06-19 14:47:53 -07:00
Philip P. Moltmann
a1716844da
Always use PermMgrSrv APIs to change permission
...
am: cf5e437b6c
2019-06-19 14:47:16 -07:00
Eric Holk
58ed47d87b
Merge "[startop] Add an app for testing startup performance"
...
am: e563643312
2019-06-19 14:40:10 -07:00
Hall Liu
6ee5ddcfbd
Update documentation for TelephonyManager#getImei
...
Update the documentation for getImei to reflect that default SMS apps
are allowed to call this API.
Fixes: 135627578
Test: compiles
Change-Id: Ifef46c9cdb16e8485f3b5bf6d582aca320052b5c
2019-06-19 21:39:40 +00:00
Winson Chung
2102ae89bb
Disable color sampling while navigation bar is hidden
...
Bug: 134568399
Test: Enter app with immersive mode, ensure the sampling is stopped,
return to non-immersive, ensure the sampling is restarted
Change-Id: Ief2e182917c5c04c473d3b1bd2c7417ccfd46c7d
2019-06-19 21:36:51 +00:00
Tim Joines
10b9def7cb
Merge "Add config to control full task snapshot scale" into qt-dev
2019-06-19 21:33:29 +00:00
Bill Yi
80d103056f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ife1b6d77055f5ca3e0b28e8b6b560248b62ad302
2019-06-19 13:57:27 -07:00
TreeHugger Robot
fa54e4b62a
Merge "Fixing wrong arguments used for permission check" into qt-dev
2019-06-19 20:56:45 +00:00
Philip P. Moltmann
c0aebc6ba1
Propagate whitelisted perms during install
...
Before there were only two choices: All or none
Fixes: 135618953
Test: atest CtsPermission2TestCases:android.permission2.cts.RestrictedPermissionsTest
Change-Id: I0989cb2c303bf508674042a2a07fbddec3e5be64
2019-06-19 13:01:43 -07:00
Treehugger Robot
e563643312
Merge "[startop] Add an app for testing startup performance"
2019-06-19 19:38:38 +00:00
Philip P. Moltmann
bf5506b240
Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev
...
* changes:
Avoid overiding bg perm app-op for pre-M apps
Also trigger PermPolicySvc on app-ops changes
Combine successive PermPolicySvc syncs
Always use PermMgrSrv APIs to change permission
2019-06-19 19:26:40 +00:00
Sunny Goyal
c55bac635a
Using correct slop for checking quickstep gesture
...
Bug: 135214165
Test: Compiles
Change-Id: I6d74b33fce31346086acfaba1b9ebfeed8f928e6
2019-06-19 12:11:52 -07:00
Sunny Goyal
12776ab723
Fixing wrong arguments used for permission check
...
Test: atest FrameworksUiServicesTests
Bug: 135551349
Change-Id: I10b21e06e5e208614cfa7fe3a2f98eb20d79dc46
2019-06-19 12:04:02 -07:00
Nazanin Bakhshi
e1ec8bbfde
Merge "Store subscriber ID / IMSI into telephony database" into qt-dev
...
am: 408704dfea
2019-06-19 11:23:00 -07:00
Tracy Zhou
4d6bb0c498
Merge "Fix a couple of rotation bugs" into qt-dev
...
am: 52f29a55ab
2019-06-19 11:11:37 -07:00
