Jayachandran Chinnakkannu
d6900e4b3c
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol"
...
am: 4257da213d
2019-11-22 10:15:56 -08:00
Ytai Ben-tsvi
e74637df68
Merge changes from topic "hidl-memory-java"
...
am: 887aa66d0a
2019-11-22 10:10:44 -08:00
Jayachandran Chinnakkannu
4257da213d
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol"
2019-11-22 17:54:23 +00: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
Paul Lawrence
3d3f98c5fe
[automerger skipped] Merge "Use mContext directly, and enforce via logging"
...
am: afb2c9e9cc8c7f0100c7
2019-11-22 09:29:42 -08:00
Paul Lawrence
afb2c9e9cc
Merge "Use mContext directly, and enforce via logging"
2019-11-22 17:19:38 +00:00
Kenny Root
1b506101de
Merge "Make RecoverySystemService more testable"
...
am: 49af39e751
2019-11-22 08:27:49 -08:00
Kenny Root
49af39e751
Merge "Make RecoverySystemService more testable"
2019-11-22 16:14:38 +00:00
Chalard Jean
aab1364ef9
Merge changes I195d894e,I7069c111
...
am: 87ed7d7816
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
Andrei-Valentin Onea
c86bfb3390
[automerger skipped] Merge "Add metrics constant for platform compat UI."
...
am: 48bb84c619e9e83a5554
2019-11-22 06:06:46 -08:00
Andrei-Valentin Onea
48bb84c619
Merge "Add metrics constant for platform compat UI."
2019-11-22 13:02:44 +00:00
Aaron Huang
4082917f46
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: 920a4a5b1b
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
Remi NGUYEN VAN
8a72e3d3b4
Merge "Move shared packages to NetworkStack project"
...
am: 27253f29ad
2019-11-21 23:15:29 -08:00
Remi NGUYEN VAN
27253f29ad
Merge "Move shared packages to NetworkStack project"
2019-11-22 06:50:22 +00:00
cncn
dca2d45630
Merge "Make Notification.Builder.SetFlag public"
...
am: c8bd4aecb3
2019-11-21 18:41:27 -08:00
Jayachandran C
c5ba7200d4
Remove usage of hidden API Emoji.isRegionalIndicatorSymbol
...
This CL copies the logic in the local file
Bug: 140908357
Test: Build
Change-Id: I1044c456fdf6ad1646811c966e0cd38c67665ad9
2019-11-21 16:49:46 -08:00
Treehugger Robot
c8bd4aecb3
Merge "Make Notification.Builder.SetFlag public"
2019-11-22 00:39:10 +00:00
Kenny Root
d508e1e61f
Make RecoverySystemService more testable
...
This allows the RecoverySystemService to be instantiated outside of its
lifecycle events and mocked connections to be injected during the tests.
Test: atest FrameworksServicesTests:RecoverySystemServiceTest
Merged-In: If75632b8dc16c916f3fa90853d6c1863b75d2c64
Change-Id: If75632b8dc16c916f3fa90853d6c1863b75d2c64
2019-11-21 23:54:05 +00:00
Jayachandran Chinnakkannu
55e2207408
Merge "Remove usage of TelecomManager.from() hidden API"
...
am: 07235288eb
2019-11-21 15:53:12 -08:00
Jayachandran Chinnakkannu
07235288eb
Merge "Remove usage of TelecomManager.from() hidden API"
2019-11-21 23:40:35 +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
Jordan Liu
850525ffaf
Merge "Expose SmsCbLocation and SmsCbMessage constructors"
...
am: d87727f7d9
2019-11-21 15:02:37 -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
Jordan Liu
d87727f7d9
Merge "Expose SmsCbLocation and SmsCbMessage constructors"
2019-11-21 22:44:52 +00:00
Jordan Liu
c3922ef9a4
Expose SmsCbLocation and SmsCbMessage constructors
...
Bug: 135956699
Test: manual
Change-Id: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
Merged-In: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
2019-11-21 13:14:02 -08:00
Bookatz
12b5e9f4c4
Merge "Update OWNERS for some server/pm/User files"
...
am: 26ba7c0911
2019-11-21 12:36:42 -08:00
Treehugger Robot
26ba7c0911
Merge "Update OWNERS for some server/pm/User files"
2019-11-21 20:01:27 +00:00
Jayachandran C
8aa54aa288
Remove usage of TelecomManager.from() hidden API
...
Bug: 140908357
Test: Build
Change-Id: I6e230e42cbecd7d7e236e0a2bfe3ea6c3d4c54c3
2019-11-21 11:58:24 -08:00
David Su
c4df6668bb
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
...
am: 1124e240c0
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
Chen Xu
da22ddac87
Merge "expose systemAPI for SmsCbLocation constructor"
...
am: 174b988133
2019-11-21 09:49:17 -08:00
Chen Xu
174b988133
Merge "expose systemAPI for SmsCbLocation constructor"
2019-11-21 17:38:41 +00:00
Makoto Onuki
d52db070cd
Merge "Explicitly take flags in createContextAsUser()"
...
am: a7948ddcb9
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
satayev
677b6b6c3c
Merge "Add OWNERS for frameworks/base/config/hiddenapi*."
...
am: 2c3312dda8
2019-11-21 06:36:00 -08:00
satayev
2c3312dda8
Merge "Add OWNERS for frameworks/base/config/hiddenapi*."
2019-11-21 14:26:40 +00:00
Chalard Jean
28df771bd4
Merge "Cut the dependency to APN constants"
...
am: 8f0513bd0b
2019-11-21 04:45:07 -08:00
Chalard Jean
8f0513bd0b
Merge "Cut the dependency to APN constants"
2019-11-21 12:37:33 +00:00
Artur Satayev
9dadbaa617
Add OWNERS for frameworks/base/config/hiddenapi*.
...
Test: N/A
Change-Id: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
Merged-In: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
2019-11-21 12:21:12 +00:00
vichang
c27cc4041b
Merge "Deprecate the use of ICU.addLikelySubtags"
...
am: 986c242b7a
2019-11-21 04:05:33 -08:00
Andrei Onea
bcd09ba70c
Add metrics constant for platform compat UI.
...
Bug: 138280620
Test: builds
Merged-In: I1a1a708596ad003a7c95906fe9514db6ec518dfc
Change-Id: I1a1a708596ad003a7c95906fe9514db6ec518dfc
2019-11-21 11:51:59 +00:00
vichang
986c242b7a
Merge "Deprecate the use of ICU.addLikelySubtags"
2019-11-21 11:25:28 +00:00
Chalard Jean
ed4371c546
Merge changes I52f70756,Icc621f0a
...
am: 0a8b713266
2019-11-21 00:48:38 -08:00
Chalard Jean
0a8b713266
Merge changes I52f70756,Icc621f0a
...
* changes:
[NS A08] Tiny refactoring
[NS A07] Move the last side effects out of the decision loop.
2019-11-21 08:32:35 +00:00
Chalard Jean
c06d788ec9
Cut the dependency to APN constants
...
With Telephony moving to Mainline these constants are not accessible
any more, and should not be made public. As they are only used by
a deprecated method that can only be called by apps with a target
SDK < M and only for one of the features it used to handle, copying
the constants until this method is completely removed is the simplest
way to go.
Test: FrameworksNetTests
Bug: 144454341
Change-Id: Iea18c8d2f2c8a40f04db9383d3f74b917267ba25
2019-11-21 14:48:00 +09:00
Daniel Colascione
1077797c14
Merge changes from topic "property-handle"
...
am: 54543bb423
2019-11-20 20:47:44 -08:00
Meng Wang
f1b067c671
Merge "Use TelephonyManager instead of ITelephony Binder"
...
am: de953fd5f2
2019-11-20 20:44:19 -08:00
