OSDN Git Service
Romain Guy [Fri, 14 Apr 2017 20:57:07 +0000 (20:57 +0000)]
Merge "Fix API feedback on Color" into oc-dev am:
03758701fb
am:
7700c2b238
Change-Id: I64f6dcabfd1722475947be3b3e3cc636b724dbed
Mady Mellor [Fri, 14 Apr 2017 20:54:56 +0000 (20:54 +0000)]
Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev am:
4b7b01c1cc
am:
daf76b82ae
Change-Id: Ia7b9f62d9040a98193e0ed79a259e0741538f494
Romain Guy [Fri, 14 Apr 2017 20:49:20 +0000 (20:49 +0000)]
Merge "Fix API feedback on Color" into oc-dev
am:
03758701fb
Change-Id: I5b3d30552adedc603a97b65b1f739c19142e70b2
Mady Mellor [Fri, 14 Apr 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev
am:
4b7b01c1cc
Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
TreeHugger Robot [Fri, 14 Apr 2017 20:42:15 +0000 (20:42 +0000)]
Merge "Fix API feedback on Color" into oc-dev
Mady Mellor [Fri, 14 Apr 2017 20:40:00 +0000 (20:40 +0000)]
Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev
Nathan Harold [Fri, 14 Apr 2017 20:35:47 +0000 (20:35 +0000)]
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev am:
9361283073
am:
3ce4d95d22
Change-Id: Ib34939764f9f347ad245c3497d36ed61c093e8eb
Nathan Harold [Fri, 14 Apr 2017 20:28:56 +0000 (20:28 +0000)]
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
am:
9361283073
Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
Nathan Harold [Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)]
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Andrew Zeng [Fri, 14 Apr 2017 20:18:39 +0000 (20:18 +0000)]
Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 am:
45bd03914c -s ours" into oc-dev-plus-aosp
am:
7750ab39b2
Change-Id: Id41aad8e09009a52be5731de1679d154757c935f
Andrew Zeng [Fri, 14 Apr 2017 20:13:42 +0000 (20:13 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 -s ours am:
d210ce63d0
am:
1ba83de49e
Change-Id: I3d173b0b3c01129ba44118d749369c535e783bde
Android Build Merger (Role) [Fri, 14 Apr 2017 20:10:55 +0000 (20:10 +0000)]
Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 am:
45bd03914c -s ours" into oc-dev-plus-aosp
Andrew Zeng [Fri, 14 Apr 2017 20:09:46 +0000 (20:09 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573
am:
45bd03914c -s ours
Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd
Andrew Zeng [Fri, 14 Apr 2017 20:08:35 +0000 (20:08 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 -s ours
am:
d210ce63d0
Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
Andrew Zeng [Fri, 14 Apr 2017 20:03:20 +0000 (20:03 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours
am:
812594f573 -s ours
Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
Andrew Zeng [Fri, 14 Apr 2017 20:02:57 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours
am:
812594f573
Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
Andrew Zeng [Fri, 14 Apr 2017 19:52:58 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
am:
2c42db20e4 -s ours
Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
Andrew Zeng [Fri, 14 Apr 2017 19:40:51 +0000 (19:40 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
Adrian Roos [Fri, 14 Apr 2017 19:40:20 +0000 (19:40 +0000)]
Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev am:
b160141698
am:
a1da551856
Change-Id: I15b1d29ae469449c3861c2b743cf4b28e777108a
Adrian Roos [Fri, 14 Apr 2017 19:35:31 +0000 (19:35 +0000)]
Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev
am:
b160141698
Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
TreeHugger Robot [Fri, 14 Apr 2017 19:24:36 +0000 (19:24 +0000)]
Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev
Christopher Tate [Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +0000)]
Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am:
28dab313ee" into oc-dev-plus-aosp
am:
09414003f5
Change-Id: Ibe8fb54fd2b10227e08d887b69767d472c098b7e
Hall Liu [Fri, 14 Apr 2017 19:12:30 +0000 (19:12 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad am:
8fa1c9c899 am:
00cf4637d2
am:
1dd67517ab
Change-Id: I1ea556033515abc44d19e24e5ccc9412e4f3404c
Android Build Merger (Role) [Fri, 14 Apr 2017 19:10:49 +0000 (19:10 +0000)]
Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am:
28dab313ee" into oc-dev-plus-aosp
Christopher Tate [Fri, 14 Apr 2017 19:09:27 +0000 (19:09 +0000)]
Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
am:
28dab313ee
Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
Hall Liu [Fri, 14 Apr 2017 19:06:37 +0000 (19:06 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad am:
8fa1c9c899
am:
00cf4637d2
Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b
Julia Reynolds [Fri, 14 Apr 2017 19:05:09 +0000 (19:05 +0000)]
Merge "Synchronize access to ranking helper records." into oc-dev am:
bf777d46f2
am:
00ac29e3dd
Change-Id: Ic6fec9eda6c3302d4893c6f5929ba5d8e8341850
TreeHugger Robot [Fri, 14 Apr 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
Julia Reynolds [Fri, 14 Apr 2017 19:03:58 +0000 (19:03 +0000)]
Merge "Lock access to managed services." into oc-dev am:
8ac1452288
am:
7e0a00e387
Change-Id: Ibe3e760716ff2ccfbb1432bbe431de33348d8cb0
Matt Sarett [Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)]
Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev am:
101dc265a8
am:
7e92ac449b
Change-Id: Ic50bd5fe0358390024bdb9a34e14906dba669f25
Julia Reynolds [Fri, 14 Apr 2017 18:56:18 +0000 (18:56 +0000)]
Merge "Synchronize access to ranking helper records." into oc-dev
am:
bf777d46f2
Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
TreeHugger Robot [Fri, 14 Apr 2017 18:52:36 +0000 (18:52 +0000)]
Merge "Synchronize access to ranking helper records." into oc-dev
Hall Liu [Fri, 14 Apr 2017 18:43:19 +0000 (18:43 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad
am:
8fa1c9c899
Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
Hall Liu [Fri, 14 Apr 2017 18:39:18 +0000 (18:39 +0000)]
Merge "Helper method in VideoCallImpl for testing"
am:
14d27fccad
Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:37:20 +0000 (18:37 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822 am:
5d57502c89 am:
5dbe26f0f1
am:
4ae323995d
Change-Id: I2d83b2c741c8d6cbf730d093adc59ec80bf1899d
Vikas Marwaha [Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am:
e768104f9b
am:
358ec57382
Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9
Wale Ogunwale [Fri, 14 Apr 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev am:
c4555784be
am:
7654775b8a
Change-Id: Icdfa610740ae34fe46e83dd3b604651392466ad9
Julia Reynolds [Fri, 14 Apr 2017 18:34:01 +0000 (18:34 +0000)]
Merge "Lock access to managed services." into oc-dev
am:
8ac1452288
Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
Svet Ganov [Fri, 14 Apr 2017 18:33:22 +0000 (18:33 +0000)]
Fix NPE in autofill am:
833c68e9fd
am:
651a974dd1
Change-Id: I3227f1272f123c8de934c4c22d6ebc1355ddf7b5
Daniel Nishi [Fri, 14 Apr 2017 18:32:11 +0000 (18:32 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev am:
864d53d6fc
am:
33f74edaa4
Change-Id: Ifd1b2a4c522cb87bed58b47653292567a48c7aa2
Hall Liu [Fri, 14 Apr 2017 18:30:25 +0000 (18:30 +0000)]
Merge "Helper method in VideoCallImpl for testing"
Matt Sarett [Fri, 14 Apr 2017 18:29:16 +0000 (18:29 +0000)]
Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
am:
101dc265a8
Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
TreeHugger Robot [Fri, 14 Apr 2017 18:28:31 +0000 (18:28 +0000)]
Merge "Lock access to managed services." into oc-dev
Dongwon Kang [Fri, 14 Apr 2017 18:27:05 +0000 (18:27 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am:
0cdc7c8874
am:
294176e988
Change-Id: I7332f731883c94f49477258357b3b392b4e21961
Alan Viverette [Fri, 14 Apr 2017 18:25:53 +0000 (18:25 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am:
7c8ab2651b
am:
efc602c307
Change-Id: Id991d413933d8435a05b129bf13e917941371c01
Alan Viverette [Fri, 14 Apr 2017 18:24:27 +0000 (18:24 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev am:
b7f0db8d89
am:
2de6b0dab0
Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
TreeHugger Robot [Fri, 14 Apr 2017 18:21:41 +0000 (18:21 +0000)]
Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:19:22 +0000 (18:19 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822 am:
5d57502c89
am:
5dbe26f0f1
Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
Chad Brubaker [Fri, 14 Apr 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am:
8ee12087e6
am:
4ad2d2b4d0
Change-Id: I784ba8d936046e65bcec1612ba77ff8aaba26975
Hugo Benichi [Fri, 14 Apr 2017 18:17:31 +0000 (18:17 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2 am:
4d80366762 am:
e505b37ec5
am:
9b7453f3c6
Change-Id: I04d6b51bef76c8937227c038c5825ed486812b71
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:13:50 +0000 (18:13 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822
am:
5d57502c89
Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
Vikas Marwaha [Fri, 14 Apr 2017 18:13:49 +0000 (18:13 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
am:
e768104f9b
Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:09:56 +0000 (18:09 +0000)]
Merge "Add PID info into ANR crash log header"
am:
2fe972c822
Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
Seigo Nonaka [Fri, 14 Apr 2017 18:09:55 +0000 (18:09 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev am:
43112fd26e
am:
83c52e0a40
Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
Hugo Benichi [Fri, 14 Apr 2017 18:07:43 +0000 (18:07 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev am:
a622b24d3a -s ours
am:
af18992066 -s ours
Change-Id: I86641338b2551a9b0136704dcfeed6327c639407
Vikas Marwaha [Fri, 14 Apr 2017 18:06:18 +0000 (18:06 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
Jorim Jaggi [Fri, 14 Apr 2017 18:05:30 +0000 (18:05 +0000)]
Merge "Implement new splash screen API" into oc-dev am:
46ae660bf2
am:
27af670d9a -s ours
Change-Id: I4f772359bf0dab72caa298597da2a995db463979
Treehugger Robot [Fri, 14 Apr 2017 18:03:11 +0000 (18:03 +0000)]
Merge "Add PID info into ANR crash log header"
Andrew Scull [Fri, 14 Apr 2017 18:01:24 +0000 (18:01 +0000)]
Merge "Service for OEM lock management." into oc-dev am:
e52a1bfede
am:
d4be031c76
Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
Svet Ganov [Fri, 14 Apr 2017 17:58:47 +0000 (17:58 +0000)]
Add back an id used by CTS am:
3de36a3cc1
am:
1ded7a1ab1
Change-Id: I68ef269ecd75d3ffffc62b0ca0dd357221353d47
Casey Burkhardt [Fri, 14 Apr 2017 17:57:42 +0000 (17:57 +0000)]
Merge "Icon assets for magnification" into oc-dev am:
4d386d5ce7
am:
549a439b53
Change-Id: I9cc4e50292a04becf92548ab5be4c54d19736a54
Jakub Pawlowski [Fri, 14 Apr 2017 17:56:35 +0000 (17:56 +0000)]
Bluetooth 5 PHY simplification am:
a51513747a
am:
ed6ce8637b
Change-Id: I336f047a649f5ff89c35ce5f69a0916b27ed0df5
Hugo Benichi [Fri, 14 Apr 2017 17:55:26 +0000 (17:55 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd am:
605eafe0a5 am:
4479901ff3
am:
43cdbc943d
Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
Jorim Jaggi [Fri, 14 Apr 2017 17:54:07 +0000 (17:54 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev am:
9d2f03ec5d
am:
5cf511907d
Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd
Winson Chung [Fri, 14 Apr 2017 17:53:03 +0000 (17:53 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am:
2e86be7653
am:
3a32d35723
Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
Romain Guy [Fri, 14 Apr 2017 17:51:58 +0000 (17:51 +0000)]
Merge "Fix javadoc typos" into oc-dev am:
4b6e82d237
am:
299ae2f422
Change-Id: Ifac19d190660a0ce129034794abe20bc5d9066dc
Andrii Kulian [Fri, 14 Apr 2017 17:46:46 +0000 (17:46 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am:
c66b6ff997
am:
aa412973d9
Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222
Wale Ogunwale [Fri, 14 Apr 2017 17:41:52 +0000 (17:41 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
am:
c4555784be
Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
Jesse Evans [Fri, 14 Apr 2017 17:41:47 +0000 (17:41 +0000)]
Merge "Fix instant app filtering in ApplicationsState" into oc-dev am:
9bdaa9c9fa
am:
783026710d
Change-Id: Id5a474354f69264a6959e8334f014860f6c98c8e
Svet Ganov [Fri, 14 Apr 2017 17:40:40 +0000 (17:40 +0000)]
Fix NPE in autofill
am:
833c68e9fd
Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
Winson Chung [Fri, 14 Apr 2017 17:40:39 +0000 (17:40 +0000)]
Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am:
4191d99614
am:
7031cdda50
Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
Svet Ganov [Fri, 14 Apr 2017 17:38:13 +0000 (17:38 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev am:
249c4d709a
am:
489cef380a
Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085
Dmitry Dementyev [Fri, 14 Apr 2017 17:33:46 +0000 (17:33 +0000)]
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am:
2a30085e5c" into oc-dev-plus-aosp
am:
0bf753d2e5
Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
Wale Ogunwale [Fri, 14 Apr 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
Hugo Benichi [Fri, 14 Apr 2017 17:32:27 +0000 (17:32 +0000)]
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am:
0e8090b10e" into oc-dev-plus-aosp
am:
562e577b1c -s ours
Change-Id: I87c54fe259d38b87c84485793aa5820b55650583
Jeff Sharkey [Fri, 14 Apr 2017 17:31:12 +0000 (17:31 +0000)]
Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am:
f5d5e5e4bf" into oc-dev-plus-aosp
am:
224b710a4f
Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d
Romain Guy [Fri, 14 Apr 2017 17:29:55 +0000 (17:29 +0000)]
Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am:
4cae059bb9" into oc-dev-plus-aosp
am:
e9277ebe4a
Change-Id: I187ec4ffcb2db909443e3c7286e1cdde7bc9193b
Svet Ganov [Fri, 14 Apr 2017 17:11:46 +0000 (10:11 -0700)]
Fix NPE in autofill
Test: manual
bug:
37330744
Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
Christopher Tate [Fri, 14 Apr 2017 17:26:00 +0000 (17:26 +0000)]
Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am:
59047acea7" into oc-dev-plus-aosp
am:
c1c3855397
Change-Id: I6c2c43156183ac5389d4ce1b1df94b517540e384
Mady Mellor [Fri, 14 Apr 2017 17:24:22 +0000 (17:24 +0000)]
Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am:
59c124b755" into oc-dev-plus-aosp
am:
900f022984
Change-Id: I937d985fe18e1e0ebc9e5d1a92c154223d95d6b0
Svet Ganov [Fri, 14 Apr 2017 17:23:00 +0000 (17:23 +0000)]
Merge "Check for non-null parent before delegating to it am:
3a74243ae4" into oc-dev-plus-aosp
am:
37933ae25b
Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe
Rebecca Silberstein [Fri, 14 Apr 2017 17:21:25 +0000 (17:21 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4 am:
6fc5051613 am:
2f7a169618
am:
01d3ad5cf2
Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617
Daniel Nishi [Fri, 14 Apr 2017 17:18:40 +0000 (17:18 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am:
864d53d6fc
Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
Andreas Huber [Fri, 14 Apr 2017 17:18:07 +0000 (17:18 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev am:
9b2ed2b7c4
am:
71a840befa -s ours
Change-Id: I6c8cfc324a62040b7df5e3f2f8c4dccfcbf09b4e
Roozbeh Pournader [Fri, 14 Apr 2017 17:14:03 +0000 (17:14 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev am:
1ad7ff32b1
am:
b9e8d31eca
Change-Id: Icd43178709b25d325a16ea9644aa5ea08bc1d2f6
Dongwon Kang [Fri, 14 Apr 2017 17:13:49 +0000 (17:13 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
am:
0cdc7c8874
Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
Daniel Nishi [Fri, 14 Apr 2017 17:11:26 +0000 (17:11 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
Julia Reynolds [Fri, 14 Apr 2017 16:29:04 +0000 (12:29 -0400)]
Synchronize access to ranking helper records.
Fixes:
36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.
Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
Dongwon Kang [Fri, 14 Apr 2017 17:05:26 +0000 (17:05 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
Yifan Hong [Fri, 14 Apr 2017 17:05:01 +0000 (17:05 +0000)]
Merge "Add Java API for libvintf." into oc-dev am:
c223d70e64
am:
38bf613c0f
Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
Alan Viverette [Fri, 14 Apr 2017 17:04:19 +0000 (17:04 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am:
7c8ab2651b
Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
Ta-wei Yen [Fri, 14 Apr 2017 17:03:34 +0000 (17:03 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am:
ad989b1711
am:
63668e4396
Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
Lorenzo Colitti [Fri, 14 Apr 2017 17:02:27 +0000 (17:02 +0000)]
resolve merge conflicts of
4db137b0599a to oc-dev-plus-aosp
am:
d6af00f5e4 -s ours
Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87
Jorim Jaggi [Fri, 14 Apr 2017 17:01:19 +0000 (17:01 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev am:
4a2be133d4
am:
054a99d029
Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
Jesse Hall [Fri, 14 Apr 2017 17:00:13 +0000 (17:00 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am:
8cafe5d9b4
am:
e20f42b8a9
Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
Julia Reynolds [Fri, 14 Apr 2017 14:01:24 +0000 (10:01 -0400)]
Lock access to managed services.
Fixes:
35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.
Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
Adam Lesinski [Fri, 14 Apr 2017 16:59:07 +0000 (16:59 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am:
b97d51a0d2
am:
48d5b68815
Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
TreeHugger Robot [Fri, 14 Apr 2017 16:56:23 +0000 (16:56 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am:
676bd21542
am:
9596d71664
Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
Daniel Nishi [Fri, 14 Apr 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev am:
74037d1287
am:
f110127aef
Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05