OSDN Git Service
Amin Shaikh [Fri, 23 Mar 2018 02:24:25 +0000 (02:24 +0000)]
Merge "QS edit mode fixes." into pi-dev am:
c6de4240d5
am:
ca84bcaee6
Change-Id: I2b1412cf3bded51ce6b326d79ad786c392fd7cc7
Matthew Ng [Fri, 23 Mar 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev am:
4fb9723faa
am:
9b32313a78
Change-Id: I9b2c30f81a318d58508049fc6fca6d1dcb29fe5f
Adrian Roos [Fri, 23 Mar 2018 02:07:01 +0000 (02:07 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev am:
7fd2abdf41
am:
0787d4be5a
Change-Id: I76c039596e43e161715ee8aee1ef021dd46e2520
Rose Liu [Fri, 23 Mar 2018 01:55:59 +0000 (01:55 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev am:
a194d92495
am:
0da0266bdf
Change-Id: I7e52c530a059592fefb14503b09cd0f416584e67
Felipe Leme [Fri, 23 Mar 2018 01:38:29 +0000 (01:38 +0000)]
Merge "Removed urlBarResourceId." into pi-dev am:
3a31f6c5cc
am:
e40a0838ba
Change-Id: I13688d0b8ce95910eae74e814030b78e28054be8
Amin Shaikh [Fri, 23 Mar 2018 01:18:25 +0000 (01:18 +0000)]
Merge "QS edit mode fixes." into pi-dev
am:
c6de4240d5
Change-Id: I33179a69d3805e454e04655e8760c8d322d89377
Suprabh Shukla [Fri, 23 Mar 2018 01:17:09 +0000 (01:17 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev am:
6affc07065
am:
31b5990893
Change-Id: Ib95745ca26362a9624b704b217b4d9078d0ade7c
Amin Shaikh [Fri, 23 Mar 2018 01:12:04 +0000 (01:12 +0000)]
Merge "Listen to all attached QS pages." into pi-dev am:
fc16c4b3c4
am:
55a9e1614b
Change-Id: Ie577bf6a7e65c50f3d29556fa9d16ed9279b05c1
Matthew Ng [Fri, 23 Mar 2018 01:10:21 +0000 (01:10 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev
am:
4fb9723faa
Change-Id: I08ceb806a1bd89e8ec58968e06c4aa6286a7baa3
Julia Reynolds [Fri, 23 Mar 2018 01:07:07 +0000 (01:07 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev am:
224e2fb2ef
am:
b598333775
Change-Id: I0bc60476384fed3dd5febaf2b27d5affcd9e9c72
Adrian Roos [Fri, 23 Mar 2018 00:59:36 +0000 (00:59 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev
am:
7fd2abdf41
Change-Id: I0c8031cb69a7176b877ff00462f2dfb555be24be
Leon Scroggins [Fri, 23 Mar 2018 00:57:54 +0000 (00:57 +0000)]
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev am:
ceb14e015b
am:
fbe597e850
Change-Id: I2a70864001a9e6cf21692bcbcb5c2cc81361f0bf
Leon Scroggins III [Fri, 23 Mar 2018 00:53:46 +0000 (00:53 +0000)]
Add the ability to autoStart AID from xml am:
1dd88daf92
am:
776e4c1e31
Change-Id: I2998ff48957a8643f965da6ba308bcfd4bd8fcdc
Rose Liu [Fri, 23 Mar 2018 00:51:52 +0000 (00:51 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev
am:
a194d92495
Change-Id: I8169e627f61659dc27ba7caa452cc2bc4f69efd7
Leon Scroggins III [Fri, 23 Mar 2018 00:51:26 +0000 (00:51 +0000)]
Re-write onPartialImage API am:
1d2bf2b846
am:
1a82348834
Change-Id: Icd8be0239571f543ae815f51d162eb1485567eec
Felipe Leme [Fri, 23 Mar 2018 00:39:16 +0000 (00:39 +0000)]
Merge "Removed urlBarResourceId." into pi-dev
am:
3a31f6c5cc
Change-Id: Ic039210e17b1f49d4232b97acdd46befcbd896d3
Suprabh Shukla [Fri, 23 Mar 2018 00:09:48 +0000 (00:09 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
am:
6affc07065
Change-Id: Icd9ccea90cac3b367b74915f76d39d7f5f740687
Ivan Podogov [Fri, 23 Mar 2018 00:07:36 +0000 (00:07 +0000)]
Merge "HIDD: Address API Review concerns" am:
8085d6f247 am:
6c64e83577
am:
153592fa3c
Change-Id: Idbb7a31a9de8092e91743c3806d6a0dba509eec6
Amin Shaikh [Fri, 23 Mar 2018 00:04:17 +0000 (00:04 +0000)]
Merge "Listen to all attached QS pages." into pi-dev
am:
fc16c4b3c4
Change-Id: Ia92a611955f44889602a8d6bb1e630abc4a06578
Julia Reynolds [Thu, 22 Mar 2018 23:58:37 +0000 (23:58 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev
am:
224e2fb2ef
Change-Id: I3b15061159a345a006dc0f5f532e93291ca1b383
Yao Chen [Thu, 22 Mar 2018 23:57:08 +0000 (23:57 +0000)]
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev am:
e8582d0ca7
am:
32e4a497ae
Change-Id: I906684efc279cfe750d96469b893578cc56d9ee5
Mike Ma [Thu, 22 Mar 2018 23:53:08 +0000 (23:53 +0000)]
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev am:
827a06d4b4
am:
0f8667423f
Change-Id: I5e02a0d410ec64d37a6917471e2cb776c373cc12
Yao Chen [Thu, 22 Mar 2018 23:49:54 +0000 (23:49 +0000)]
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev am:
23ceeb3a44
am:
1daf645614
Change-Id: Ic7f84da8df6f41afeec5934d796607a0d3895f3c
Leon Scroggins [Thu, 22 Mar 2018 23:43:38 +0000 (23:43 +0000)]
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
am:
ceb14e015b
Change-Id: I92ffd12b6e8df360a86733ca99676cd8f470addb
Leon Scroggins III [Thu, 22 Mar 2018 23:40:46 +0000 (23:40 +0000)]
Merge "Disable Bitmap density scaling to Picture" into pi-dev am:
e7c26531c0
am:
79625818ca
Change-Id: I2a5a44fc56c0119e9f7626c0f346a5917f96e976
Leon Scroggins III [Thu, 22 Mar 2018 23:38:55 +0000 (23:38 +0000)]
Add the ability to autoStart AID from xml
am:
1dd88daf92
Change-Id: I01fc7e34b4e2909f6984b9266e237f3cc9f08432
Felipe Leme [Thu, 22 Mar 2018 23:36:02 +0000 (23:36 +0000)]
Merge "Enable Autofill Field Classification by default." into pi-dev am:
9bea50471f
am:
36caae3e6d
Change-Id: I1f9275ed1103439bfda405b4653c4425074528a1
Leon Scroggins III [Thu, 22 Mar 2018 23:34:41 +0000 (23:34 +0000)]
Re-write onPartialImage API
am:
1d2bf2b846
Change-Id: I7436bbe89b9efd9a406958b14f79294e982c5b3a
Jorim Jaggi [Thu, 22 Mar 2018 23:33:05 +0000 (23:33 +0000)]
Merge "Remove old workaround for display issues" into pi-dev am:
a43de8b61a
am:
40b24d6a98
Change-Id: Iacf0ad45c6ece65f6e9c37b97612f1e205ebde45
Ivan Podogov [Thu, 22 Mar 2018 23:13:16 +0000 (23:13 +0000)]
Merge "HIDD: Address API Review concerns" am:
8085d6f247
am:
6c64e83577
Change-Id: Ibcdc31fcb01a583ca05c056b2063f77c0f4dbeb6
Victor Hsieh [Thu, 22 Mar 2018 23:07:08 +0000 (23:07 +0000)]
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev am:
f4f7859149
am:
c8a154f83c
Change-Id: I7ae0658100cd231d702ad5e1c34493e0aedff953
Ivan Podogov [Thu, 22 Mar 2018 23:03:17 +0000 (23:03 +0000)]
Merge "HIDD: Address API Review concerns"
am:
8085d6f247
Change-Id: I7f4e272657874b02d122f7ddc291c0f006eeee30
TreeHugger Robot [Thu, 22 Mar 2018 22:51:09 +0000 (22:51 +0000)]
Merge "QS edit mode fixes." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:43:28 +0000 (22:43 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:41:40 +0000 (22:41 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev
Yao Chen [Thu, 22 Mar 2018 22:40:57 +0000 (22:40 +0000)]
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev
am:
e8582d0ca7
Change-Id: I48a6624f0621bebd42806c148e58da1c13c6db31
Mike Ma [Thu, 22 Mar 2018 22:35:58 +0000 (22:35 +0000)]
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev
am:
827a06d4b4
Change-Id: I9086e4560f676693329a42ac71194ff1e64e8222
Yao Chen [Thu, 22 Mar 2018 22:32:07 +0000 (22:32 +0000)]
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev
am:
23ceeb3a44
Change-Id: I0fd1b8d930fb87e144193b9d3911b3a00c3113af
Rose Liu [Thu, 22 Mar 2018 22:27:50 +0000 (22:27 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:22:30 +0000 (22:22 +0000)]
Merge "Removed urlBarResourceId." into pi-dev
Leon Scroggins III [Thu, 22 Mar 2018 22:19:46 +0000 (22:19 +0000)]
Merge "Disable Bitmap density scaling to Picture" into pi-dev
am:
e7c26531c0
Change-Id: I44ee1a14af2ef7f2743e7105e6cc04b9afdac460
Nathan Harold [Thu, 22 Mar 2018 22:17:26 +0000 (22:17 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev am:
8a047a0c52
am:
e9ae13cabe
Change-Id: I9197eb54de99c9f5274d722cd25c35c654fa6137
TreeHugger Robot [Thu, 22 Mar 2018 22:15:31 +0000 (22:15 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 22:14:20 +0000 (22:14 +0000)]
Merge "Enable Autofill Field Classification by default." into pi-dev
am:
9bea50471f
Change-Id: I49f3c8c84c06aa2ab8f5ed7f0a8695d8a7306778
TreeHugger Robot [Thu, 22 Mar 2018 22:07:37 +0000 (22:07 +0000)]
Merge "Listen to all attached QS pages." into pi-dev
Jorim Jaggi [Thu, 22 Mar 2018 22:06:07 +0000 (22:06 +0000)]
Merge "Remove old workaround for display issues" into pi-dev
am:
a43de8b61a
Change-Id: I8852443ed74f94a60975b74c192a1ac65ad20dd1
Ying Xu [Thu, 22 Mar 2018 22:05:11 +0000 (22:05 +0000)]
[automerger skipped]Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev am:
812319dc7d -s ours
am:
bf8329a728 -s ours
Change-Id: I5c36e1e75a5d7f90b7301f4a6e7d0153424b7b24
Julia Reynolds [Thu, 22 Mar 2018 22:03:48 +0000 (22:03 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev
Leon Scroggins [Thu, 22 Mar 2018 21:53:05 +0000 (21:53 +0000)]
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
* changes:
Rename ImageDecoder.ERRORs
Add the ability to autoStart AID from xml
Re-write onPartialImage API
Treehugger Robot [Thu, 22 Mar 2018 21:50:57 +0000 (21:50 +0000)]
Merge "HIDD: Address API Review concerns"
Victor Hsieh [Thu, 22 Mar 2018 21:47:04 +0000 (21:47 +0000)]
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev
am:
f4f7859149
Change-Id: I23947e85c07310074b4a57bb5db680837c57e977
Dmitry Dementyev [Thu, 22 Mar 2018 21:46:49 +0000 (21:46 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev am:
6f2965af79
am:
c808b9c1ca
Change-Id: I9a4b86d3372d2b888809cfef635ed4c308a164a9
TreeHugger Robot [Thu, 22 Mar 2018 21:41:35 +0000 (21:41 +0000)]
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 21:39:03 +0000 (21:39 +0000)]
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 21:36:50 +0000 (21:36 +0000)]
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev
Annie Meng [Thu, 22 Mar 2018 21:36:27 +0000 (21:36 +0000)]
Merge "Revert "Update references to backup/restore agent timeouts""
Nathan Harold [Thu, 22 Mar 2018 21:35:36 +0000 (21:35 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
am:
8a047a0c52
Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029
TreeHugger Robot [Thu, 22 Mar 2018 21:34:32 +0000 (21:34 +0000)]
Merge "Disable Bitmap density scaling to Picture" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:26:19 +0000 (21:26 +0000)]
[automerger skipped]Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
am:
812319dc7d -s ours
Change-Id: If5e490d53cb3b3957756b716f5ebbd7f12d45cce
Felipe Leme [Thu, 22 Mar 2018 21:20:34 +0000 (21:20 +0000)]
Merge "Enable Autofill Field Classification by default." into pi-dev
Yao Chen [Thu, 22 Mar 2018 21:19:46 +0000 (21:19 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev am:
c219348186
am:
a084750e4c
Change-Id: Iddf985cef10175aa8fb38a529e7876d3dd139f60
Jorim Jaggi [Thu, 22 Mar 2018 21:18:49 +0000 (21:18 +0000)]
Merge "Remove old workaround for display issues" into pi-dev
Victor Hsieh [Thu, 22 Mar 2018 21:17:56 +0000 (21:17 +0000)]
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:14:45 +0000 (21:14 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" am:
ec76adb9ff am:
3b84db2329
am:
a8be468657
Change-Id: I406bbb27d7ec94b4122180388badb7757cbae104
Nathan Harold [Thu, 22 Mar 2018 21:14:36 +0000 (21:14 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:14:32 +0000 (21:14 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 21:05:47 +0000 (21:05 +0000)]
[automerger skipped]Merge "Rename handover failure constant per API review comments." into pi-dev am:
3a4d495733
am:
99fe3a8497 -s ours
Change-Id: Idd50478d20f936d6d6deb9b8d8fe1ad22ba8e5bb
Dmitry Dementyev [Thu, 22 Mar 2018 21:04:07 +0000 (21:04 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
am:
6f2965af79
Change-Id: I6a12ff573c6a4b13407692bc230871b94f03a683
Amin Shaikh [Wed, 21 Mar 2018 21:03:37 +0000 (17:03 -0400)]
QS edit mode fixes.
- Remove secondary text for system tiles
- Show app name as secondary text for app tiles
- Fix left side cutoff
Change-Id: I010995c8fc42eb8b77360ade4830049e494c129a
Fixes:
74983414
Test: visual
Yao Chen [Thu, 22 Mar 2018 20:48:20 +0000 (20:48 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
am:
c219348186
Change-Id: I2de4afb40faac68dcb508a4861a628575e6e91fb
rongliu [Wed, 14 Mar 2018 22:43:40 +0000 (15:43 -0700)]
Assign -1 as default value of window type and owner uid.
Bug:
74622357
Test: Test with ag/
3738015 together. Layers without buffers have window
type -1 and owner uid -1.
Change-Id: I6f010bf1327671a06874b75bc0a63a3fb010ced7
Ying Xu [Thu, 22 Mar 2018 20:40:10 +0000 (20:40 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" am:
ec76adb9ff
am:
3b84db2329
Change-Id: I2a9bd2d3b691418debf601b869049e7df090c3a8
Mathieu Chartier [Thu, 22 Mar 2018 20:38:53 +0000 (20:38 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev am:
90ad15400a
am:
eff60b2742
Change-Id: Iebc44c28d1554da5c70141781c6d3365cb1d01f0
Dmitry Dementyev [Thu, 22 Mar 2018 20:33:34 +0000 (20:33 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 20:33:25 +0000 (20:33 +0000)]
Merge "Update duration text" into pi-dev am:
538ba7ac35
am:
825ac25ea5
Change-Id: I84f21aaa24110a44062aacce7ceba04664ddb38c
Tyler Gunn [Thu, 22 Mar 2018 20:33:10 +0000 (20:33 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
am:
3a4d495733
Change-Id: Id22d791f96936fe2cdf0d5b9b4a47ce3583eef6a
Ying Xu [Thu, 22 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
am:
ec76adb9ff
Change-Id: I437a82ea0d7d71102f273cbca1b54ef7f332027e
Mathieu Chartier [Thu, 22 Mar 2018 20:28:44 +0000 (20:28 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
am:
90ad15400a
Change-Id: I1d2b05e6959538b5b60a63f76fcd10b42b8e83a5
Yao Chen [Thu, 22 Mar 2018 20:24:41 +0000 (20:24 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 20:22:20 +0000 (20:22 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 20:20:01 +0000 (20:20 +0000)]
Merge "Update duration text" into pi-dev
am:
538ba7ac35
Change-Id: I2534474e88a93f611f6223115659b1dc3ff7c515
Mathieu Chartier [Thu, 22 Mar 2018 20:11:07 +0000 (20:11 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
David Brazdil [Thu, 22 Mar 2018 18:42:41 +0000 (18:42 +0000)]
Revert "Enable hidden API blacklist"
This reverts commit
16bfa11b73a34be1f1c72d2ffe86702f85378e92.
Reason for revert: Revert until b/
76138670 is fixed
Bug:
64382372
Bug:
76138670
Bug:
76157445
Change-Id: Iaf6c76b773fbea4d4710b38808dee2e7e06f5e78
Julia Reynolds [Thu, 22 Mar 2018 20:04:40 +0000 (20:04 +0000)]
Merge "Update duration text" into pi-dev
Andrew Sapperstein [Thu, 22 Mar 2018 20:00:57 +0000 (20:00 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev am:
eae9144add
am:
7173585579
Change-Id: Iccd46da5eb3dd3938fd8c2c68822938bfb4748fa
Suprabh Shukla [Fri, 9 Mar 2018 02:21:50 +0000 (18:21 -0800)]
APIs to suspend packages with SUSPEND_APPS permission
Changed the existing hidden api setPackagesSuspendedAsUser to a system
api setPackagesSuspended that can be called by apps with either
MANAGE_USERS or SUSPEND_APPS permission. Additionally, the suspending
app can now specify optional extra information meant to be used by the
suspended apps and the launcher to deal with this state.
The following other APIs are added:
- isPackageSuspended(): Apps can query whether they are in a suspended
state
- @SystemApi getPackageSuspendedAppExtras(String): Apps with permission
SUSPEND_APPS can get the appExtras passed to PM when suspending the
app.
- @SystemApi setPackageSuspendedAppExtras(String, PersistableBundle):
Apps with permission SUSPEND_APPS can update app extras for a
suspended package.
- getPackageSuspendedAppExtras(): Apps can call to get the appExtras
passed in to PM when they were suspended.
Test: Can be run via:
atest com.android.server.pm.PackageManagerSettingsTests
atest com.android.server.pm.PackageUserStateTest
atest com.android.server.pm.SuspendPackagesTest
Bug:
74336673
Change-Id: I3b9ed2c8478b34ee2e8986f5f5fddb2839d102e3
Pankaj Kanwar [Thu, 22 Mar 2018 19:50:27 +0000 (19:50 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am:
320b6c2312 am:
063c6dc0f6
am:
df215ee9f3
Change-Id: Ic0a0e91d91b82466e4bb05b3b872dfd390be73b7
Andrew Sapperstein [Thu, 22 Mar 2018 19:48:50 +0000 (19:48 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
am:
eae9144add
Change-Id: I5952002efb67fe425e67218ab5cade748a251d37
Nathan Harold [Thu, 22 Mar 2018 19:41:01 +0000 (19:41 +0000)]
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev am:
33ed612cca -s ours
am:
8033a03f9c -s ours
Change-Id: I85f74c4687a54243ccdf290c0a011745623fb040
Andrew Sapperstein [Thu, 22 Mar 2018 19:31:23 +0000 (19:31 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
Pankaj Kanwar [Thu, 22 Mar 2018 19:16:52 +0000 (19:16 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am:
320b6c2312
am:
063c6dc0f6
Change-Id: Icd154b391b05dfa4ed16a97407a15dd7f03ad106
Makoto Onuki [Thu, 22 Mar 2018 19:15:02 +0000 (19:15 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev am:
c7f6eadffc
am:
3a6af5133e
Change-Id: Ia7ec47f226e74bc65856a80c2f30ba604930962b
Nathan Harold [Thu, 22 Mar 2018 19:11:11 +0000 (19:11 +0000)]
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
am:
33ed612cca -s ours
Change-Id: Ieca39ff6788ca7293ff95516120b947e502f4085
Pankaj Kanwar [Thu, 22 Mar 2018 19:10:11 +0000 (19:10 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
am:
320b6c2312
Change-Id: Ie6f23da9c3c531fef9eb32b52d377a8f0e772b77
yinxu [Fri, 16 Mar 2018 17:16:53 +0000 (10:16 -0700)]
Add more comments for the isConfigForIdentifiedCarrier()
This is a clean cherry-pick from:
https://android-review.git.corp.google.com/c/platform/frameworks/base/+/642231
Bug:
74945742
Test: Compile
Change-Id: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
Merged-in: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
(cherry picked from commit
cea0d8d4883c94482d936abd4d097617921c6fa7)
Ying Xu [Thu, 22 Mar 2018 19:07:45 +0000 (19:07 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
Tej Singh [Thu, 22 Mar 2018 19:06:10 +0000 (19:06 +0000)]
[automerger skipped]Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am:
fe5fdb1213 -s ours" into pi-dev-plus-aosp
am:
d244048264 -s ours
Change-Id: I4a8f5f08da5ebc6daf9728ace8a7fd1843c20895
Chong Zhang [Thu, 22 Mar 2018 18:54:57 +0000 (18:54 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev am:
9e64c01d02
am:
a60c81cf0d
Change-Id: Ic3d4c958745ec68d4480a637c46eb252c3dac4d5
Felipe Leme [Thu, 22 Mar 2018 18:48:27 +0000 (18:48 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev am:
de6dfd93e5
am:
a14992b585
Change-Id: I00f8979ad1a686413b34a4d1f150a467949c55bc
Makoto Onuki [Thu, 22 Mar 2018 18:45:31 +0000 (18:45 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
am:
c7f6eadffc
Change-Id: I22451d7234f52332ddd5e4811f9fe9b957469265
OSDN Git Service
