OSDN Git Service
Paul Duffin [Tue, 14 Nov 2017 13:15:37 +0000 (13:15 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"
am:
ee2fb3c59e
Change-Id: I197bd9e2458ff9f966754c459ee77f03c3517eb5
Treehugger Robot [Tue, 14 Nov 2017 13:05:20 +0000 (13:05 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"
Paul Duffin [Tue, 14 Nov 2017 10:11:18 +0000 (10:11 +0000)]
Stop using c.a.i.u.Predicate outside test-runner
This class has been deprecated and should only be used in the
frameworks/base/test-runner directory.
Bug:
30188076
Test: make checkbuild
Change-Id: I61059a96aa6045c44546239b94b329c02bb745a1
Calin Juravle [Tue, 14 Nov 2017 03:03:56 +0000 (03:03 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
am:
f7f5732e2c
Change-Id: I6f2eb760e07959e26d46f8a0f3d4b4358b9a5a1e
Treehugger Robot [Tue, 14 Nov 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
Calin Juravle [Tue, 5 Sep 2017 00:32:23 +0000 (17:32 -0700)]
Create secondary dex profiles relative to the provided dex path
We previously used the realpath to simplify the validation and processing
in installd. However it ended up making things more complicated when
cleaning up the profiles, especially because of /data/user/0 symlinks to
/data/data/.
Instead of using the realpath of the dex file to compute the profile
location, use the file path as given. This makes things consistent with
DexManager registration and allows for easier dex file reconciliation in
the presence of symlinks.
Bug:
64460009
Test: manual
(cherry picked from commit
c119c5a8c1d8e3ba6c90300a82d2086273d0d3f3)
Merged-In: I2362f32a679324d4bc1e8a0fe83b5b17ee523e7a
Change-Id: Ic9c38a920c5eef85f26ac33f2b8a37c3694bfbad
brycelee [Mon, 13 Nov 2017 23:30:22 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."
am:
62893396bd -s ours
Change-Id: If48b9be41b03c30a5eeed2d497f99535c2c82219
brycelee [Mon, 13 Nov 2017 23:21:09 +0000 (23:21 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."
Jordan Liu [Mon, 13 Nov 2017 22:02:52 +0000 (22:02 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode"
am:
0f113b2f25
Change-Id: I85dde983b57cf901e710cd1f1ac3e409b3b7976e
Jordan Liu [Mon, 13 Nov 2017 21:53:24 +0000 (21:53 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode"
Bryce Lee [Tue, 31 Oct 2017 22:40:33 +0000 (15:40 -0700)]
DO NOT MERGE Remove orientation restriction to only fullscreen activities.
This changelist removes checks that enforce that only fullscreen,
opaque activities may request orientation changes. An application
may itself be compatible with the change and update their SDK level.
However, it is possible they use a library that has not itself been
updated and still leverages this feature for non-fullscreen
activities.
Fixes:
68684796
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: I75bbda96b132694c722b0b535e33ea5e1b9a55db
Koji Fukui [Mon, 13 Nov 2017 20:53:35 +0000 (20:53 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed"
am:
e7240a52e2
Change-Id: Idc81f05fe3820d1bcbfd81d6497c0608ef37fae3
Treehugger Robot [Mon, 13 Nov 2017 20:42:09 +0000 (20:42 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed"
Hugo Benichi [Mon, 13 Nov 2017 13:24:10 +0000 (13:24 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports"
am:
f8fdb06c27
Change-Id: I92dfce6a78de18036ca0b54fdf2ee95e715c678b
Hugo Benichi [Mon, 13 Nov 2017 13:13:44 +0000 (13:13 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports"
Koji Fukui [Fri, 20 Oct 2017 07:42:51 +0000 (16:42 +0900)]
Stop observing death of PrintManager listener when it is removed
Symptom:
Global reference table overflow happens on system_server.
Root cause:
When a listener is added to the PrintManager, death notification for
the listener is registered. So the listener is added to global
reference table.
But the death notification is not unregistered when the listener is
removed from PrintManager. The listener isn't removed from the global
reference table until client process die. If client process repeatedly
add/remove listener, the global reference table overflow.
Solution:
Call unlinkToDeath() when the listener is removed from PrintManager.
Test: cts-tradefed run cts-dev -m Print
Bug:
68746445
Change-Id: I0b133e4607317a15e51bdf6e1248552dcc920d6d
Hugo Benichi [Fri, 10 Nov 2017 23:06:43 +0000 (08:06 +0900)]
IP connectivity metrics: NetworkEvents have transports
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.
Bug:
34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics
Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
Hugo Benichi [Mon, 13 Nov 2017 04:06:11 +0000 (04:06 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics"
am:
6ee20ca7d3
Change-Id: I8fea75c477d4b5fbbded7dee2dff8644c6f97241
Hugo Benichi [Mon, 13 Nov 2017 03:58:34 +0000 (03:58 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics"
Hugo Benichi [Sun, 12 Nov 2017 22:36:21 +0000 (22:36 +0000)]
Merge "Add Network security watchlist service"
am:
e672ab4c0a
Change-Id: I3e3d8dbc220879752826faa7570f04585c2f1107
Hugo Benichi [Sun, 12 Nov 2017 22:24:56 +0000 (22:24 +0000)]
Merge "Add Network security watchlist service"
Ricky Wai [Fri, 27 Oct 2017 13:46:01 +0000 (14:46 +0100)]
Add Network security watchlist service
Partial cherry pick from commit
1a6e667cb6e9211908d02eb21c50c006473376f9
adding a new INetdEventCallback type.
Bug:
63908748
Test: built, flashed, $ runtest frameworks-net
Change-Id: I1b95cc4e5cbbfbdbd7429d61e2dcb67b90d278bb
Merged-In: I09595178bac0070a867bc5e0501a7bf2c840e398
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Add L2~L4 information to packet wakeup logs and metrics
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)
Bug:
66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
Pirama Arumuga Nainar [Sat, 11 Nov 2017 13:37:00 +0000 (13:37 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning"
am:
bcf27fa6a7
Change-Id: If8aa81372dd6fcc433867892e27c37670184fbc6
Treehugger Robot [Sat, 11 Nov 2017 13:29:23 +0000 (13:29 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning"
Jakub Pawlowski [Sat, 11 Nov 2017 00:22:27 +0000 (00:22 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
am:
8d742759cc
Change-Id: Id850f587e6ee58b18ffbe1651c0526a7fd39491f
Jakub Pawlowski [Sat, 11 Nov 2017 00:13:41 +0000 (00:13 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
Pirama Arumuga Nainar [Fri, 10 Nov 2017 21:51:10 +0000 (13:51 -0800)]
Remove GCC-specific pragma and disabled Clang warning
Bug: http://b/
68236396
Do not suppress the GCC-specific -Wunused-but-set-variable warning,
which Clang doesn't support.
Test: Build the topic
Change-Id: Ibeaaf927f44fe65f939d3d728c6fe642bcca595f
Jakub Pawlowski [Mon, 6 Nov 2017 20:17:30 +0000 (12:17 -0800)]
Move connectSocket into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Merged-In: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Hall Liu [Fri, 10 Nov 2017 21:14:01 +0000 (21:14 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5"
am:
f6b2b77e40
Change-Id: I1c740fee4e612253098aa56ebdb70dafc83c6f43
Hall Liu [Fri, 10 Nov 2017 21:10:01 +0000 (21:10 +0000)]
Add @TestApi for DownloadStateCallback CTS
am:
63c5fd60ac
Change-Id: I3ffa9e070f014a0280486cd5a9a58af205ac7aab
Hall Liu [Fri, 10 Nov 2017 20:46:19 +0000 (20:46 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5"
* changes:
Add @TestApi for MbmsDownloadReceiver CTS
Add @TestApi for DownloadStateCallback CTS
Hall Liu [Fri, 10 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
am:
025718e8f6
Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda
Hall Liu [Fri, 10 Nov 2017 19:49:01 +0000 (19:49 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
Tetsutoki Shiozawa [Fri, 10 Nov 2017 16:57:22 +0000 (16:57 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
am:
4741faa258
Change-Id: Ifc79d7ccd5d6837a39263b6ba9728f8b4d82f81d
Treehugger Robot [Fri, 10 Nov 2017 16:47:00 +0000 (16:47 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
Yoshinori Hirano [Fri, 10 Nov 2017 15:15:44 +0000 (15:15 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am:
a524e7d87d -s ours
Change-Id: I5af03e211cda75d016131db6001ac6b79836a018
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
Victor Hsieh [Fri, 10 Nov 2017 10:32:37 +0000 (10:32 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
am:
41f1ef8c02 -s ours
Change-Id: Icf296e0f93486f2ab9c9a1bdd6e8274b58341809
Treehugger Robot [Fri, 10 Nov 2017 10:22:17 +0000 (10:22 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
Jakub Pawlowski [Fri, 10 Nov 2017 08:22:05 +0000 (08:22 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
am:
3e9b9b74b4
Change-Id: Ic98a1281eb6f3f6d1deb450c5123913b2c8d25a6
Treehugger Robot [Fri, 10 Nov 2017 08:11:26 +0000 (08:11 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
Yoshinori Hirano [Tue, 24 Oct 2017 09:23:09 +0000 (18:23 +0900)]
Send broadcast when location mode is about to change DO NOT MERGE
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.
Fixes:
28057031
Test: manual - turn the location setting on
Change-Id: Ia2db3554755a643609cfb5f0fc30f2dc2cc1beeb
Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:43:56 +0000 (00:43 +0000)]
Merge "Remove the OEM hook implementation and usage"
am:
413a308126
Change-Id: Ib81fa81a4a87f4378b9ab137a8c3eb5e386d1f0f
Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Remove the OEM hook implementation and usage"
Hall Liu [Wed, 8 Nov 2017 01:59:28 +0000 (17:59 -0800)]
Update Telecom APIs to include multi-hfp
* Add bluetooth devices to CallAudioState
* Add methods for specifying a bluetooth device to InCallService
* Add methods for specifying a bluetooth device to Connection (for
self-managed connections)
Bug:
64767509
Test: unit tests
Change-Id: I286b19b423dc2ee417dbc90eda7e8055b2da2444
Victor Hsieh [Thu, 9 Nov 2017 18:32:10 +0000 (10:32 -0800)]
DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob
Other than the renaming, the meaning is now opposite.
Test: build
Bug:
67415855
Bug:
63920015
Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a
Jakub Pawlowski [Thu, 9 Nov 2017 22:30:31 +0000 (22:30 +0000)]
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am:
b2bde067c2
Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481
Jakub Pawlowski [Thu, 9 Nov 2017 22:25:29 +0000 (22:25 +0000)]
Add IBluetoothSocketManager (3/3)
am:
422af4d049
Change-Id: Ic246d5e4f5a62b3f201c700a007faaffe2ebf9e3
Jakub Pawlowski [Mon, 6 Nov 2017 20:16:25 +0000 (12:16 -0800)]
Move createSocketChannel into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Change-Id: I52b03ff3d637bf661c70279b7ca18b105157f7a2
Jakub Pawlowski [Thu, 9 Nov 2017 22:11:38 +0000 (22:11 +0000)]
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
* changes:
Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
Add IBluetoothSocketManager (3/3)
Hemant Gupta [Thu, 9 Nov 2017 21:51:52 +0000 (21:51 +0000)]
Merge "OBEX : Handle Negative index Exception"
am:
08d23cf07a
Change-Id: Icd513d2060cf1e8fe8fcd06bbedfc0ef5bf5a6fd
Treehugger Robot [Thu, 9 Nov 2017 21:12:43 +0000 (21:12 +0000)]
Merge "OBEX : Handle Negative index Exception"
Hemant Gupta [Wed, 28 Dec 2016 06:40:47 +0000 (12:10 +0530)]
OBEX : Handle Negative index Exception
Use case:
1. Send file to remote device.
2. Wait for accepting the file transfer on remote device.
Use Specific remote device(that sends some
optional headers).
Failure:
No file acceptance popup seen on remote device.
Root cause:
Crash in com.android.bluetooth.
FATAL EXCEPTION: BtOpp ClientThread
Process: com.android.bluetooth, PID: 22527
java.lang.NegativeArraySizeException: -3
at javax.obex.ObexHelper.updateHeaderSet(ObexHelper.java:216)
at javax.obex.ClientSession.sendRequest(ClientSession.java:568)
at javax.obex.ClientSession.connect(ClientSession.java:148)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
connect(BluetoothOppObexClientSession.java:317)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
run(BluetoothOppObexClientSession.java:231)
am_crash( 1402): [22527,0,com.android.bluetooth,
818462277,java.lang.
NegativeArraySizeException,-3,ObexHelper.java,216]
Fix:
Add length check before allocate memory and break loop if length is less than
expected header length as per OBEX Specification to prevent crash.
Test: Verified that OPP Tx and Rx works successfully multiple times.
Bug:
35588578
Change-Id: I805e6b1d51f69645d5132c3c18db2e752d04b096
Jakub Pawlowski [Wed, 1 Nov 2017 22:27:17 +0000 (15:27 -0700)]
Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
Bug:
68359837
Test: compile
Change-Id: I3cec0b5b20dde33be09a5bbc451cd79273c67961
Jakub Pawlowski [Wed, 1 Nov 2017 17:12:36 +0000 (10:12 -0700)]
Add IBluetoothSocketManager (3/3)
Add IBluetoothSocketManager native Binder implementation. Thanks to it
we'll skip jni to native calls, and need to re-serialize data manually.
Bug:
68359837
Test: none
Change-Id: I6c99717aa18ab41addf96b7536e483ae12802601
Jordan Liu [Thu, 9 Nov 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
am:
bbaa19cad3
Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92
Jordan Liu [Thu, 9 Nov 2017 18:24:16 +0000 (18:24 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
Hugo Benichi [Thu, 9 Nov 2017 12:34:40 +0000 (12:34 +0000)]
Merge "MacAddress follow-up: define the core of the class"
am:
cd35c65b5b
Change-Id: Ic86df7e56a63d3f84ccaebefa904c7625105c581
Hugo Benichi [Thu, 9 Nov 2017 12:22:17 +0000 (12:22 +0000)]
Merge "MacAddress follow-up: define the core of the class"
Hugo Benichi [Wed, 8 Nov 2017 15:22:25 +0000 (00:22 +0900)]
MacAddress follow-up: define the core of the class
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
Andreas Gampe [Thu, 9 Nov 2017 03:32:07 +0000 (03:32 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
am:
08efd36872
Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e
Treehugger Robot [Thu, 9 Nov 2017 03:21:27 +0000 (03:21 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
Brad Ebinger [Wed, 8 Nov 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Remove ImsService Feature Interfaces"
am:
abfdf0e03d
Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c
Brad Ebinger [Wed, 8 Nov 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Remove ImsService Feature Interfaces"
Ivan Lozano [Wed, 8 Nov 2017 20:20:06 +0000 (20:20 +0000)]
Merge "Disable integer sanitizer in release function."
am:
969ceebc5d
Change-Id: If880a4a81b11c32a5906ccc3f0d999ae515cfbc8
Ivan Lozano [Wed, 8 Nov 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Disable integer sanitizer in release function."
yuemingw [Wed, 8 Nov 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Add OWNED_BY field."
am:
107141be5c
Change-Id: Ib3ee22a0407881e6e7e754ea3504f5568c0ac31a
Treehugger Robot [Wed, 8 Nov 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Add OWNED_BY field."
nharold [Wed, 8 Nov 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
am:
c8ff280e73
Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec
Benedict Wong [Wed, 8 Nov 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
am:
3db35dfcd5
Change-Id: I71b24c9da8c677e35d05b6623eb99ec17f823b4b
nharold [Wed, 8 Nov 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
Ivan Lozano [Wed, 8 Nov 2017 17:48:11 +0000 (09:48 -0800)]
Disable integer sanitizer in release function.
EphemeralStorage::release was causing an unsigned integer overflow on
boot due to the way the for loop is constructed. This function doesn't
need to be sanitized. This adds the no_sanitize attribute to the
function.
Bug:
30969751
Test: Compiles and device boots without runtime error.
Change-Id: Id28a2891624c1fe077fa5e27051540a39e33fe71
Benedict Wong [Wed, 8 Nov 2017 17:47:40 +0000 (17:47 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
Brad Ebinger [Wed, 8 Nov 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
am:
b5d2f0c24f
Change-Id: If8fbd0b2adf9f3f2f9a5d4a670b1e0bf1b445066
Brad Ebinger [Wed, 8 Nov 2017 17:12:44 +0000 (17:12 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
Andreas Gampe [Wed, 8 Nov 2017 16:53:10 +0000 (16:53 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
am:
f597ad5106
Change-Id: I1d4f37c16ff9dfe8cdc998274d4e8b50e1987be7
Tobias Thierer [Wed, 8 Nov 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am:
e8b07e5bef
Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
Andreas Gampe [Wed, 8 Nov 2017 16:40:12 +0000 (16:40 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"
This reverts commit
84bf6b809d5b1d80137f1653ab2346ebe0b08ca6.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I8f13fbb3afe91da54afafbafc758df4e194def11
Treehugger Robot [Wed, 8 Nov 2017 16:36:59 +0000 (16:36 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
Tobias Thierer [Wed, 8 Nov 2017 16:34:03 +0000 (16:34 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
Brad Ebinger [Wed, 8 Nov 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
am:
7805de4002
Change-Id: I0ec39abb8006c7b29b449a59c7408a97549671f0
Brad Ebinger [Wed, 8 Nov 2017 16:20:39 +0000 (16:20 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
yuemingw [Wed, 8 Nov 2017 13:12:18 +0000 (13:12 +0000)]
Add OWNED_BY field.
Bug:
68208199
Test: later
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit#heading=h.jza6dz6kh6bz
Change-Id: Ic78df7902523bad4b3d40bacb73b17d767226aac
Masaho Nishikawa [Wed, 1 Nov 2017 11:33:36 +0000 (20:33 +0900)]
Add config to use a display rule that ServiceState was considered
Add config to use a spn/plmn display rule that the roaming state of
ServiceState was considered. The default value is false.
Test: manual - Verified that PLMN/SPN which the carrier configuration
was considered is displayed.
Bug:
67835339
Change-Id: I05a4938ae51b03190e06e407c41c894b8feb8ea7
manabu, shimoda [Fri, 6 Oct 2017 05:39:01 +0000 (14:39 +0900)]
Customize the default value of Enhanced 4G LTE mode
To control the default value by carrier configuration,
- Add a carrier option to control default Enhanced 4G LTE mode enabled.
- Remove initializing Settings.Global.ENHANCED_4G_MODE_ENABLED.
Test: manual - Checked that the "Enhanced 4G LTE mode" can be controlled
by carrier config.
Bug:
67725875
Change-Id: Ic714abcae5c388cc12e6c4b1f45e2abb07febf54
Tetsutoki Shiozawa [Wed, 1 Nov 2017 02:38:34 +0000 (11:38 +0900)]
Fix: WindowManagerGlobal#setStoppedState failed by IOOBE
Symptom:
An application crashed due to IndexOutOfBoundsException.
The exception was thrown at WindowManagerGlobal#setStoppedState.
Root cause:
setStoppedState invokes setWindowStopped for each ViewRoot by
ascending order. If an application removes its view within the
loop, loop index exceeds the number of items.
Solution:
Loop in descending order.
Bug:
69018607
Change-Id: I7e20282dc99b767912be4e00d81ffb49fe6c7ac0
Hugo Benichi [Wed, 8 Nov 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Define MacAddress class"
am:
925349ac8f
Change-Id: If270c17b1b763e302b848fba2fe4660ce5929018
Hugo Benichi [Wed, 8 Nov 2017 06:30:04 +0000 (06:30 +0000)]
Merge "Define MacAddress class"
Hugo Benichi [Wed, 8 Nov 2017 03:39:55 +0000 (03:39 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
am:
ee56b4a65c
Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
Jayachandran C [Wed, 25 Oct 2017 16:45:52 +0000 (09:45 -0700)]
Remove the OEM hook implementation and usage
Vendors and OEMs shall use HIDL extension going forward
to send OEM specific message
Test: Basic Telephony Sanity
Bug:
34344851
Change-Id: I977004cf49f9c61b434dc2ded2effa29ace0f603
Treehugger Robot [Wed, 8 Nov 2017 03:27:25 +0000 (03:27 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
Andreas Gampe [Wed, 8 Nov 2017 02:21:58 +0000 (02:21 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
This reverts commit
e131dac848cb4d0998e1dee2219382250c71d277.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I32d938abb73c8d8df74716ede8032d9874086fda
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Define MacAddress class
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
Nathan Harold [Wed, 8 Nov 2017 01:17:45 +0000 (17:17 -0800)]
Fix signature for finalize() to resolve API Lint error
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug:
69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
Benedict Wong [Thu, 2 Nov 2017 00:14:25 +0000 (17:14 -0700)]
Update documentation for AES-GCM-ESP keymat length
Added notes that keymat length must include 32 bits of salt.
Bug:
68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
Hugo Benichi [Tue, 7 Nov 2017 12:42:10 +0000 (21:42 +0900)]
Networking metrics: minor pretty printing improvements
Bug:
65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
Hugo Benichi [Tue, 7 Nov 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Refactor ApfFilter creation"
am:
5e619dce66
Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4
Hugo Benichi [Tue, 7 Nov 2017 22:22:19 +0000 (22:22 +0000)]
Merge "Refactor ApfFilter creation"
Brad Ebinger [Tue, 7 Nov 2017 19:05:51 +0000 (11:05 -0800)]
Remove ImsService Feature Interfaces
The ImsService feature interfaces were designed
to support a flat ImsService AIDL. This is not
necessary anymore, so this interface is being
removed as part of prep for the new ImsService
definition.
Test: Manual
Change-Id: Iefbcd168441ce2547523cf3e6a99ab3de5f3f823
OSDN Git Service
