Charles Munger
17fac19d82
Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475
...
am: 769cf05c56
Change-Id: I1acede5beae3963825155e83eaa4381ea27c83c6
2019-11-22 16:08:57 -08:00
Charles Munger
769cf05c56
Merge "Deprecate FileUtils.closeQuietly"
...
am: e4b84f3475
Change-Id: Ia2f71d7cd97b32a175d0210a8f567ae75030439e
2019-11-22 16:03:14 -08:00
Treehugger Robot
e4b84f3475
Merge "Deprecate FileUtils.closeQuietly"
2019-11-22 23:52:41 +00:00
Rahul Sabnis
8c6b4a1938
Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f
...
am: e89625113d
Change-Id: Ifa162b24cf19f85f15f10e0ce975bf3006979a71
2019-11-22 15:07:44 -08:00
Rahul Sabnis
e89625113d
Merge "Resolve API dependencies on BluetoothPan"
...
am: bad5a30d4f
Change-Id: Ic9e920c37c6417485f5be12ac6137bb6e0626b92
2019-11-22 15:02:16 -08:00
Treehugger Robot
bad5a30d4f
Merge "Resolve API dependencies on BluetoothPan"
2019-11-22 22:54:37 +00:00
Charles Munger
e28f085137
Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46
...
am: 87119ab3e2
Change-Id: Id3f4e5cc41c143161b0fc5d7b173a1baff88de5b
2019-11-22 13:55:18 -08:00
Charles Munger
87119ab3e2
Merge "Deprecate ListActivity and ExpandableListActivity"
...
am: 0600b03d46
Change-Id: Ia077618f79c17277abe49ddd0bd8ddcc20586b0c
2019-11-22 13:49:30 -08:00
Charles Munger
d1c3f26e59
Merge "Deprecate TimingLogger" am: aec0ab99d4
...
am: 416618a591
Change-Id: Id637c04d15e48a928b7ff05a3133dbb5cf103656
2019-11-22 12:57:53 -08:00
Treehugger Robot
0600b03d46
Merge "Deprecate ListActivity and ExpandableListActivity"
2019-11-22 20:53:55 +00:00
Charles Munger
416618a591
Merge "Deprecate TimingLogger"
...
am: aec0ab99d4
Change-Id: Ie6709d7e83ee68d491eac481635bcba3d44efe1e
2019-11-22 12:51:48 -08:00
Treehugger Robot
aec0ab99d4
Merge "Deprecate TimingLogger"
2019-11-22 20:22:40 +00:00
Charles Munger
d2db9aeebc
Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7
...
am: 8292d73554
Change-Id: If6337140dff6edca87030b2d747ac1393f963957
2019-11-22 12:17:06 -08:00
Charles Munger
8292d73554
Merge "Deprecate Looper.prepareMainLooper"
...
am: b1f69203e7
Change-Id: If66e250dcaa558eef033abaed08b72642004aec6
2019-11-22 12:10:59 -08:00
Treehugger Robot
b1f69203e7
Merge "Deprecate Looper.prepareMainLooper"
2019-11-22 19:59:44 +00:00
Ytai Ben-tsvi
dd682aacaf
Merge changes from topic "hidl-memory-java" am: 887aa66d0a
...
am: e74637df68
Change-Id: I475fdc72808a6d5767f09ac1f1796ef511696696
2019-11-22 10:16:39 -08:00
Ytai Ben-tsvi
e74637df68
Merge changes from topic "hidl-memory-java"
...
am: 887aa66d0a
Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b
2019-11-22 10:10:44 -08:00
Ytai Ben-tsvi
887aa66d0a
Merge changes from topic "hidl-memory-java"
...
* changes:
Add HidlMemoryUtil
Add parceling support for HIDL memory in Java
2019-11-22 17:54:06 +00:00
David Castro
1294b8b570
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752 am: 3a6d5555cd
...
am: 56be7c0b58
Change-Id: I8ee35a24fc7fe2549e7a7a2c0875c0ea24e32476
2019-11-22 09:09:15 -08:00
David Castro
56be7c0b58
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752
...
am: 3a6d5555cd
Change-Id: I7684da1e104dac4f62ed3a7ef3f928c1598509aa
2019-11-22 09:02:02 -08:00
David Castro
3a6d5555cd
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
...
am: 3b74a86752
Change-Id: I2b5e70ef834a0d0f4ccc3689d036321094a24170
2019-11-22 08:55:24 -08:00
TreeHugger Robot
3b74a86752
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
2019-11-22 16:48:36 +00:00
Chalard Jean
eb24ef664f
Merge changes I195d894e,I7069c111 am: 87ed7d7816
...
am: aab1364ef9
Change-Id: Ia75369ad6b360644392766296542efa4a5fdf0ce
2019-11-22 06:33:34 -08:00
Chalard Jean
aab1364ef9
Merge changes I195d894e,I7069c111
...
am: 87ed7d7816
Change-Id: I8e41058df03284ca677bf67930c5702d7d6c63bb
2019-11-22 06:27:42 -08:00
Chalard Jean
87ed7d7816
Merge changes I195d894e,I7069c111
...
* changes:
[NS A10] Cleanup
[NS A09] Always rematch all networks to requests
2019-11-22 14:08:09 +00:00
Aaron Huang
d78b2a0b67
Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b
...
am: 4082917f46
Change-Id: I9ef7325d73b1df9b1a3eb32e419e4cd1caeb7729
2019-11-22 01:47:14 -08:00
Aaron Huang
4082917f46
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: 920a4a5b1b
Change-Id: I7fa9b282ca87f0c442e267acb8424f6aeed5d3a0
2019-11-22 01:40:49 -08:00
Aaron Huang
920a4a5b1b
Merge "Expose IpConfiguration and ProxyInfo APIs"
2019-11-22 09:25:16 +00:00
cncn
689403c3d5
Merge "Make Notification.Builder.SetFlag public" am: c8bd4aecb3
...
am: dca2d45630
Change-Id: I705e0967e993237d9f1ac2b276e66fab2422f098
2019-11-21 18:51:47 -08:00
cncn
dca2d45630
Merge "Make Notification.Builder.SetFlag public"
...
am: c8bd4aecb3
Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b
2019-11-21 18:41:27 -08:00
TreeHugger Robot
d6dfaf4c9d
Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev
2019-11-22 00:51:41 +00:00
Treehugger Robot
c8bd4aecb3
Merge "Make Notification.Builder.SetFlag public"
2019-11-22 00:39:10 +00:00
Ytai Ben-Tsvi
a736d1c1ee
Add HidlMemoryUtil
...
Convenience utilities for working with HidlMemory.
Change-Id: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Merged-In: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Bug: 143566068
2019-11-21 15:28:09 -08:00
Ytai Ben-Tsvi
a907efc3bc
Add parceling support for HIDL memory in Java
...
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.
Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
Merged-In: I6cbbf852218c8a631f9014e7caa7a97d17e11889
2019-11-21 15:19:47 -08:00
cncn
9d0fd9c9d6
Make Notification.Builder.SetFlag public
...
Bug: 144846447
Test: Build Successfully
Change-Id: If25bede41eec1f7e7ca3ae8fc669df1964d7da05
2019-11-21 22:55:13 +00:00
Rahul Sabnis
a052447ad6
Resolve API dependencies on BluetoothPan
...
Bug: 143244283
Test: Manual
Change-Id: Ie419b2f83358d06d094dcf4921c4595fc0e72857
2019-11-21 13:16:02 -08:00
Jay Aliomer
8fd7fb99cf
Dark theme twilight mode backend and tile
...
am: 381e3300e8
Change-Id: I0d5b96795d5ad818a9b7a21758721e35059d18ed
2019-11-21 12:23:42 -08:00
David Su
02076c7a01
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 1124e240c0
...
am: c4df6668bb
Change-Id: I6e50821d3fdd5e6ff5fc4cd238ccd186dd1ff94c
2019-11-21 11:58:10 -08:00
David Su
c4df6668bb
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
...
am: 1124e240c0
Change-Id: Ia0c92f1db33b0a884da7388cd31b33d51df29288
2019-11-21 11:50:57 -08:00
David Su
1124e240c0
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
2019-11-21 18:44:46 +00:00
Jay Aliomer
381e3300e8
Dark theme twilight mode backend and tile
...
When the user has Dark theme scheduling turned on (b/141567787), the quick settings tile subtext should reflect the following:
If Dark theme is on: "Until sunrise"
If Dark theme is off: "On at sunset"
If the user does not have Dark theme scheduled, the text should not appear.
This matches the appearance of the Night Light QS tile.
All starting windows snapshots will be deleted and splash screens
will be used instead.
Test: atest UiModeManagerServiceTest
Fix: 143874807
Merged-In: Ie2ce64b5c5544fffe76be7ec3f971eb7461f8c4d
Change-Id: Ie2ce64b5c5544fffe76be7ec3f971eb7461f8c4d
(cherry picked from commit 8b2671b029 )
2019-11-21 18:05:22 +00:00
Makoto Onuki
b0100311bf
Merge "Explicitly take flags in createContextAsUser()" am: a7948ddcb9
...
am: d52db070cd
Change-Id: I7ed103b7c148508635818e779b55a585b1540c85
2019-11-21 08:13:05 -08:00
Makoto Onuki
d52db070cd
Merge "Explicitly take flags in createContextAsUser()"
...
am: a7948ddcb9
Change-Id: I6947903d66da1e64c461a1557e82a72a97a8848b
2019-11-21 08:05:06 -08:00
Treehugger Robot
a7948ddcb9
Merge "Explicitly take flags in createContextAsUser()"
2019-11-21 15:53:59 +00:00
David Castro
345de96beb
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 am: 6d62047661
...
am: e93ab1d3ee
Change-Id: Ie0b77841701c25534cb181a0f25ba1a4ee6262be
2019-11-21 05:00:02 -08:00
Chalard Jean
72cd1fa27a
Merge "Cut the dependency to APN constants" am: 8f0513bd0b
...
am: 28df771bd4
Change-Id: I97f01b82916e66673339bef437d80927e78282ee
2019-11-21 04:52:31 -08:00
David Castro
e93ab1d3ee
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456
...
am: 6d62047661
Change-Id: I5c57f96546f33a7746013fc1ae23332d8e5014b7
2019-11-21 04:52:27 -08:00
Chalard Jean
28df771bd4
Merge "Cut the dependency to APN constants"
...
am: 8f0513bd0b
Change-Id: I140f294e0b044c66b925ae5c8ae6f2859c694753
2019-11-21 04:45:07 -08:00
David Castro
6d62047661
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev
...
am: 8bd0310456
Change-Id: Ib5d2d07b77e57d65bb5b028773ed063606247a16
2019-11-21 04:45:04 -08:00
TreeHugger Robot
69b6876c58
Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev
2019-11-21 12:42:42 +00:00