OSDN Git Service
Svetoslav Ganov [Sat, 15 Apr 2017 00:02:01 +0000 (00:02 +0000)]
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am:
21da54587b
am:
3b3d9f8415
Change-Id: If448d00811124f5a12d9cae166e2c81a83d13f02
Roozbeh Pournader [Sat, 15 Apr 2017 00:00:36 +0000 (00:00 +0000)]
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev am:
2a05c5edb7
am:
2ad47527f8
Change-Id: Ib0639bc5e7b5e761d800b3e87915b59cd8523bb0
Eugene Susla [Fri, 14 Apr 2017 23:59:25 +0000 (23:59 +0000)]
[DO NOT MERGE] Add an opnion to use advertised name for renaming am:
75fb821029
am:
ac4e846ccd
Change-Id: I9296605dab1f6f0839d4e08fa4d35329aa19a454
Eugene Susla [Fri, 14 Apr 2017 23:58:16 +0000 (23:58 +0000)]
[DO NOT MERGE] Stop scan on device chooser activity backgrounded am:
200c37f413
am:
c242b76a4b
Change-Id: I0bda2f7f098721c3adf13adaa9016d02244a30b3
Eugene Susla [Fri, 14 Apr 2017 23:57:06 +0000 (23:57 +0000)]
[DO NOT MERGE] Improve the error msg when started not for result am:
5423b4e0a8
am:
24cf2d9d72
Change-Id: I8b55e20253230f838555162a9d57c4f5f6ae56b4
Svetoslav Ganov [Fri, 14 Apr 2017 23:55:56 +0000 (23:55 +0000)]
Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev am:
728ce60465
am:
c9741d133d -s ours
Change-Id: I62123b943a59fb73302f2a094cd8133da15d5060
Svetoslav Ganov [Fri, 14 Apr 2017 23:34:22 +0000 (23:34 +0000)]
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev
am:
21da54587b
Change-Id: I332d4aeeb7eb14a0b51a60382c8efedf4e1d5375
Roozbeh Pournader [Fri, 14 Apr 2017 23:33:01 +0000 (23:33 +0000)]
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
am:
2a05c5edb7
Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb
Eugene Susla [Fri, 14 Apr 2017 23:31:53 +0000 (23:31 +0000)]
[DO NOT MERGE] Add an opnion to use advertised name for renaming
am:
75fb821029
Change-Id: Iead08333400d2ddc0568ae3b7f09f6ccb7fdbc1f
Eugene Susla [Fri, 14 Apr 2017 23:30:46 +0000 (23:30 +0000)]
[DO NOT MERGE] Stop scan on device chooser activity backgrounded
am:
200c37f413
Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
Eugene Susla [Fri, 14 Apr 2017 23:23:45 +0000 (23:23 +0000)]
[DO NOT MERGE] Improve the error msg when started not for result
am:
5423b4e0a8
Change-Id: I44b112065b12b10cfd00498479380a9c5ad57be4
Svetoslav Ganov [Fri, 14 Apr 2017 23:22:26 +0000 (23:22 +0000)]
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 23:22:07 +0000 (23:22 +0000)]
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
Eugene Susla [Wed, 29 Mar 2017 03:27:28 +0000 (20:27 -0700)]
[DO NOT MERGE] Fix associations serialization optimization bug
There mas a missing defensive copy causing false positive detections of
"associations not changed" case, leading to xml file not being updated once
at least one record is present
Bug:
30932767
Test: Associate at least two different devices and ensure the xml has both.
Change-Id: Ic0dc615dd2b847e137555c1084c616831b4dde83
Eugene Susla [Wed, 5 Apr 2017 17:36:24 +0000 (10:36 -0700)]
[DO NOT MERGE] Add an opnion to use advertised name for renaming
Test: Use new API, make sure renaming works
Change-Id: I9251c5db24495b8594fadce2beab3347a1aec884
Svetoslav Ganov [Fri, 14 Apr 2017 23:18:03 +0000 (23:18 +0000)]
Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev
am:
728ce60465
Change-Id: Ic89d0c7084e56e24a358191660aeebe917df6b4b
Eugene Susla [Tue, 28 Mar 2017 22:40:44 +0000 (15:40 -0700)]
[DO NOT MERGE] Stop scan on device chooser activity backgrounded
This effectively treats chooser activity pause event as cancel.
Bug:
30932767
Test: Install two toy apps and call associate API from both.
Ensure foreground app always end up showing fresh data.
Change-Id: I7f5742e9878245550f678efd244bf84c427baef3
Eugene Susla [Mon, 27 Mar 2017 23:57:40 +0000 (16:57 -0700)]
[DO NOT MERGE] Improve the error msg when started not for result
This makes sure that if the association request callback IntentResult
s accidentally started not for result, the resulting exception is
metioning it explicitly.
Test: Ensure the error message when calling the IntentSender not for result
explicitly mentions the requirement for the activity to be called for result.
Bug:
30932767
Change-Id: I950f262af43c555fb20dd5e49e935e476f24bba8
Svetoslav Ganov [Fri, 14 Apr 2017 23:11:26 +0000 (23:11 +0000)]
Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev
Eugene Susla [Tue, 28 Mar 2017 22:04:12 +0000 (15:04 -0700)]
[DO NOT MERGE] Fix a bug with filtering by raw bytes
(when such filter is not provided)
See change in BluetoothDeviceFilterUtils
Bug:
30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.
Change-Id: I4397fa33dd0c48771c8a754791a171f2d0bd64eb
TreeHugger Robot [Fri, 14 Apr 2017 22:42:02 +0000 (22:42 +0000)]
Merge "Add isSmallBatteryDevice flag to ActivityManager."
Seigo Nonaka [Fri, 14 Apr 2017 22:24:34 +0000 (22:24 +0000)]
Merge "Fix boot loop issue on Android Wear." into oc-dev am:
5f9fde884b
am:
f08388e8ea
Change-Id: I5c61dfb5166e4456f55ef79a122c8fc0b312ed86
Seigo Nonaka [Fri, 14 Apr 2017 22:20:35 +0000 (22:20 +0000)]
Merge "Fix boot loop issue on Android Wear." into oc-dev
am:
5f9fde884b
Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb
TreeHugger Robot [Fri, 14 Apr 2017 22:16:19 +0000 (22:16 +0000)]
Merge "Fix boot loop issue on Android Wear." into oc-dev
Philip P. Moltmann [Fri, 14 Apr 2017 22:16:02 +0000 (22:16 +0000)]
Merge "Fix some racines in AutofillManager" into oc-dev am:
2ddd69ce1a
am:
ae774ec189
Change-Id: Ic035560141f16118a4fefb3bb0f65edd6bd228cc
Philip P. Moltmann [Fri, 14 Apr 2017 22:11:06 +0000 (22:11 +0000)]
Merge "Fix some racines in AutofillManager" into oc-dev
am:
2ddd69ce1a
Change-Id: Iec8454a36985484148b821f598446d5305c601bc
TreeHugger Robot [Fri, 14 Apr 2017 22:04:34 +0000 (22:04 +0000)]
Merge "Fix some racines in AutofillManager" into oc-dev
Badhri Jagan Sridharan [Fri, 14 Apr 2017 21:58:20 +0000 (21:58 +0000)]
Merge "Repost USB and ADB notification when locale changes"
Android Build Merger (Role) [Fri, 14 Apr 2017 21:20:43 +0000 (21:20 +0000)]
Merge "Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am:
c99bcc69f7 am:
f713a1960e"
Romain Guy [Fri, 14 Apr 2017 21:19:25 +0000 (21:19 +0000)]
Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am:
c99bcc69f7
am:
f713a1960e
Change-Id: Ie1d361e946cf68ba97352ef6946f9d82ed5b784b
Marc Hittinger [Fri, 14 Apr 2017 21:19:03 +0000 (21:19 +0000)]
Merge "Add debug property to enable low_ram mode."
Romain Guy [Fri, 14 Apr 2017 21:14:10 +0000 (21:14 +0000)]
Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev
am:
c99bcc69f7
Change-Id: I016c2b265dc471b74cd703281b3de60d7e54bfea
Romain Guy [Fri, 14 Apr 2017 21:10:00 +0000 (21:10 +0000)]
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev am:
1eaab2db82
am:
fd715c7fbe
Change-Id: I1b97afca9c46a6e2c1c33a9f68da49e43c039b46
Jason Monk [Fri, 14 Apr 2017 21:08:45 +0000 (21:08 +0000)]
Merge "Convert signal icon to be custom drawable" into oc-dev am:
06426bf652
am:
389755704e
Change-Id: Idce35feb4c53e68970a289b4e811b2a2e9b09d01
Romain Guy [Fri, 14 Apr 2017 21:08:34 +0000 (21:08 +0000)]
Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev
Romain Guy [Fri, 14 Apr 2017 21:05:55 +0000 (21:05 +0000)]
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev
am:
1eaab2db82
Change-Id: I2b843c5f94460f5ee7d9a7767d0411fe6c117a3c
Jason Monk [Fri, 14 Apr 2017 20:58:31 +0000 (20:58 +0000)]
Merge "Convert signal icon to be custom drawable" into oc-dev
am:
06426bf652
Change-Id: I3fddf788317b91e65c22ec75bb3e6aa0509f64fe
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
TreeHugger Robot [Fri, 14 Apr 2017 20:53:22 +0000 (20:53 +0000)]
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev
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:44:14 +0000 (20:44 +0000)]
Merge "Convert signal icon to be custom drawable" into oc-dev
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
Philip P. Moltmann [Tue, 11 Apr 2017 17:13:33 +0000 (10:13 -0700)]
Fix some racines in AutofillManager
- The session might be gone by the time the handler is called, hence check
the sessionID
- Access getClientLocked() and mSession only under mLock.
Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
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
Michael Kwan [Fri, 14 Apr 2017 19:34:46 +0000 (12:34 -0700)]
Add isSmallBatteryDevice flag to ActivityManager.
Bug:
37351903
Change-Id: I6fed08c35474b10987388070eafb7b16e6944638
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
Jason Monk [Mon, 10 Apr 2017 19:01:27 +0000 (15:01 -0400)]
Convert signal icon to be custom drawable
This will make it really easy to change the number of bars it
displays.
Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes:
35902355
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
Badhri Jagan Sridharan [Fri, 14 Apr 2017 18:43:22 +0000 (11:43 -0700)]
Repost USB and ADB notification when locale changes
Bug:
37266276
Test: Manually tested the language of active notifications after
switching language.
Change-Id: I0cef61fbd155e0c9789f52a140561c71969fbab7
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
Roozbeh Pournader [Thu, 13 Apr 2017 22:51:32 +0000 (15:51 -0700)]
Support overriding display locale for SuggestedLocaleAdapter
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.
Fixes:
31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
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