OSDN Git Service
Etan Cohen [Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am:
eff6f4fc43
am:
b50d958c4a
Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb
Etan Cohen [Wed, 1 Mar 2017 17:45:42 +0000 (17:45 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
am:
eff6f4fc43
Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
Etan Cohen [Wed, 1 Mar 2017 17:39:14 +0000 (17:39 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
Tyler Gunn [Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)]
resolve merge conflicts of
81a28efd1b16 to stage-aosp-master
am:
b455f0deed
Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f
Tyler Gunn [Wed, 1 Mar 2017 16:44:32 +0000 (08:44 -0800)]
resolve merge conflicts of
81a28efd1b16 to stage-aosp-master
Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
Tyler Gunn [Wed, 1 Mar 2017 16:08:39 +0000 (16:08 +0000)]
Merge "Support confirmation of international calls while on WFC only."
Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]
[AWARE] Add data-path security configuration (PMK)
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.
Clarify the default API to mean open (unencrypted) data-path.
Bug:
33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
Nathan Harold [Wed, 1 Mar 2017 14:17:46 +0000 (14:17 +0000)]
Merge "Add API Surface for creating IpSec Transforms" am:
7645fa2816
am:
0a6305d5dd
Change-Id: Ie1798e4d7dda91a970db40e078016fcbcf89149f
Nathan Harold [Wed, 1 Mar 2017 14:12:55 +0000 (14:12 +0000)]
Merge "Add API Surface for creating IpSec Transforms"
am:
7645fa2816
Change-Id: Ibe70a60c5c5808a7877145cccefcc1f11bfacc51
Treehugger Robot [Wed, 1 Mar 2017 14:05:47 +0000 (14:05 +0000)]
Merge "Add API Surface for creating IpSec Transforms"
Erik Kline [Wed, 1 Mar 2017 11:50:41 +0000 (11:50 +0000)]
Merge "Fix dead lock in Tethering state machine" am:
355dbae680
am:
0703f03953
Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f
Erik Kline [Wed, 1 Mar 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Fix dead lock in Tethering state machine"
am:
355dbae680
Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30
Erik Kline [Wed, 1 Mar 2017 11:40:02 +0000 (11:40 +0000)]
Merge "Fix dead lock in Tethering state machine"
Erik Kline [Wed, 1 Mar 2017 11:08:06 +0000 (11:08 +0000)]
Merge "Also test for additional NetworkCallback calls" am:
dff6c5c30d
am:
47d8385184
Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba
Erik Kline [Wed, 1 Mar 2017 11:03:08 +0000 (11:03 +0000)]
Merge "Also test for additional NetworkCallback calls"
am:
dff6c5c30d
Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
Treehugger Robot [Wed, 1 Mar 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Also test for additional NetworkCallback calls"
Erik Kline [Tue, 28 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Also test for additional NetworkCallback calls
Specifcally:
- onCapabilitiesChanged
- onLinkPropertiesChanged
- onNetworkSuspended
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
Nathan Harold [Fri, 13 Jan 2017 02:38:57 +0000 (18:38 -0800)]
Add API Surface for creating IpSec Transforms
This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.
Bug:
30984788
Bug:
34811752
Test:
34812052,
34811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a
George Burgess IV [Wed, 1 Mar 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix memory-leak warnings from the static analyzer" am:
2006bfc9ad
am:
43fd84a03c
Change-Id: Id2b577a021a3163d9f489235bf7f76c5f5ae527e
George Burgess IV [Wed, 1 Mar 2017 01:53:27 +0000 (01:53 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
am:
2006bfc9ad
Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642
Treehugger Robot [Wed, 1 Mar 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
Hall Liu [Wed, 1 Mar 2017 01:05:58 +0000 (01:05 +0000)]
Merge "Add @hide to RttAudioMode IntDef" am:
22af0f3377
am:
c284379659
Change-Id: I892dd9f7c070aade5962b53277a860a55ed237ea
Hall Liu [Wed, 1 Mar 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Add @hide to RttAudioMode IntDef"
am:
22af0f3377
Change-Id: Ifdfdf7ced2f88188314475c99dd58cdf886f014d
Hall Liu [Wed, 1 Mar 2017 00:51:37 +0000 (00:51 +0000)]
Merge "Add @hide to RttAudioMode IntDef"
George Burgess IV [Wed, 25 Jan 2017 00:30:22 +0000 (16:30 -0800)]
Fix memory-leak warnings from the static analyzer
Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.
Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b
Hall Liu [Tue, 28 Feb 2017 23:17:44 +0000 (15:17 -0800)]
Add @hide to RttAudioMode IntDef
IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.
Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix:
35808951
Brad Ebinger [Tue, 28 Feb 2017 22:55:55 +0000 (22:55 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am:
b987777f20
am:
59282ad8df
Change-Id: I9637f55a80f89afa89111b5889b69987aba3e20a
Brad Ebinger [Tue, 28 Feb 2017 22:50:38 +0000 (22:50 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
am:
b987777f20
Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862
Brad Ebinger [Tue, 28 Feb 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
Tyler Gunn [Fri, 17 Feb 2017 00:21:14 +0000 (16:21 -0800)]
Support confirmation of international calls while on WFC only.
Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.
Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.
Test: Manual, unit.
Bug:
33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Andre Eisenbach [Tue, 28 Feb 2017 19:29:07 +0000 (19:29 +0000)]
Merge "Bluetooth: fix enable log: display 24h time" am:
17cb857301
am:
add7c533c6
Change-Id: Ib10e76a44ee4ea10294b65ba01d2b028df6afe50
Andre Eisenbach [Tue, 28 Feb 2017 19:14:58 +0000 (19:14 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"
am:
17cb857301
Change-Id: Ic9ba7b27e9ad997a6f8ba0ae6e4794903ef7806a
Andre Eisenbach [Tue, 28 Feb 2017 19:04:13 +0000 (19:04 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"
Marie Janssen [Fri, 24 Feb 2017 19:06:33 +0000 (11:06 -0800)]
Bluetooth: fix enable log: display 24h time
Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25
Brad Ebinger [Mon, 27 Feb 2017 21:38:53 +0000 (13:38 -0800)]
Send the IMS_SERVICE_UP intent when it is STATE_READY
The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.
Also, add READ_PRIVILEGED_PHONE_STATE check
Bug:
35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
Amin Shaikh [Tue, 28 Feb 2017 17:16:35 +0000 (17:16 +0000)]
Merge "Setting for RecommendedNetworkEvaluator cache TTL" am:
924878a752
am:
8bd0af0210
Change-Id: Ia18ef46b48d701eafad4c29988fca90d70005573
Amin Shaikh [Tue, 28 Feb 2017 17:11:35 +0000 (17:11 +0000)]
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
am:
924878a752
Change-Id: I945898d88baa26f210cd0d86cdf064844af6f92e
Treehugger Robot [Tue, 28 Feb 2017 17:05:43 +0000 (17:05 +0000)]
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
Paul Lawrence [Tue, 28 Feb 2017 15:47:48 +0000 (15:47 +0000)]
Merge "Move seccomp policy logic to bionic" am:
ef64558393
am:
da6d5f702d
Change-Id: I474f127d2924190e1154cc9d3f1afdfa064154ae
Paul Lawrence [Tue, 28 Feb 2017 15:41:57 +0000 (15:41 +0000)]
Merge "Move seccomp policy logic to bionic"
am:
ef64558393
Change-Id: I9c9e6c9cc1f8b1617a0c7e627b94d0d643f22a3e
Treehugger Robot [Tue, 28 Feb 2017 15:36:07 +0000 (15:36 +0000)]
Merge "Move seccomp policy logic to bionic"
Amin Shaikh [Tue, 7 Feb 2017 00:22:42 +0000 (16:22 -0800)]
Setting for RecommendedNetworkEvaluator cache TTL
Bug:
19948759
Bug:
33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Brad Ebinger [Mon, 27 Feb 2017 21:30:19 +0000 (21:30 +0000)]
Merge "Adds read/modify permission checks to ImsService" am:
3e64003641
am:
175213e1ee
Change-Id: Ia55e5751b222e3e95780e16821e832f760b2d7c5
Brad Ebinger [Mon, 27 Feb 2017 21:26:50 +0000 (21:26 +0000)]
Merge "Adds read/modify permission checks to ImsService"
am:
3e64003641
Change-Id: Ia4cb2c789a13658de86c0a36648a09e7abceb621
Brad Ebinger [Mon, 27 Feb 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Adds read/modify permission checks to ImsService"
Julius D'souza [Mon, 27 Feb 2017 19:18:11 +0000 (19:18 +0000)]
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am:
106f1443c1 -s ours
am:
8beca4cc6f
Change-Id: I798681141b035eb3f29ab4824f2807cdb21010d9
Julius D'souza [Mon, 27 Feb 2017 19:14:07 +0000 (19:14 +0000)]
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on.
am:
106f1443c1 -s ours
Change-Id: I8541342d3466e4e1d686b3faa890830edadba940
Etan Cohen [Mon, 27 Feb 2017 18:46:11 +0000 (18:46 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am:
f81911bcd2
am:
97bf0f5e9b
Change-Id: Ib62285494ffee7a4c35bc3583417e0cacc0d5d83
Etan Cohen [Mon, 27 Feb 2017 18:42:05 +0000 (18:42 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am:
f81911bcd2
Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9
Etan Cohen [Mon, 27 Feb 2017 18:33:34 +0000 (18:33 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
Paul Lawrence [Thu, 16 Feb 2017 17:25:12 +0000 (09:25 -0800)]
Move seccomp policy logic to bionic
Test: Make sure builds, runs, seccomp policy still applied
Bug:
35720753
Change-Id: Ieb09dd88cf070d4b4f1277d1a88d0ce250bb05b4
Paul Lawrence [Mon, 27 Feb 2017 16:51:06 +0000 (16:51 +0000)]
Merge "Revert "Move seccomp policy logic to bionic"" am:
4ebce43b37
am:
a853184575
Change-Id: I311f326743a9945eec04aebafaadbf6b64e06fe3
Paul Lawrence [Mon, 27 Feb 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""
am:
4ebce43b37
Change-Id: I276412507fcb3ef577931e7406964fd7040615c7
Paul Lawrence [Mon, 27 Feb 2017 16:39:11 +0000 (16:39 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""
Paul Lawrence [Mon, 27 Feb 2017 16:32:10 +0000 (16:32 +0000)]
Revert "Move seccomp policy logic to bionic"
This reverts commit
48c30ef529543c9bbd1b55f9e05c666b3ffeb7c6.
Reverting build-breaking change
Change-Id: Iad6270e51cb1ead0efbd52c2dfcc6d2118931e4e
Paul Lawrence [Mon, 27 Feb 2017 16:22:11 +0000 (16:22 +0000)]
Merge "Move seccomp policy logic to bionic" am:
7ed4ca9032
am:
d97791e74f
Change-Id: I12c1efaa13d3998fc9fb22ec08df4a12bf29c3c8
Paul Lawrence [Mon, 27 Feb 2017 16:15:38 +0000 (16:15 +0000)]
Merge "Move seccomp policy logic to bionic"
am:
7ed4ca9032
Change-Id: I744d6c4545edd9d221deb79bbbeea83d459e3161
Paul Lawrence [Mon, 27 Feb 2017 16:09:39 +0000 (16:09 +0000)]
Merge "Move seccomp policy logic to bionic"
Tyler Gunn [Mon, 27 Feb 2017 03:05:21 +0000 (03:05 +0000)]
Merge "Fix videoStateToString for audio/paused state." am:
89e7a888be
am:
2f96f34373
Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7
Tyler Gunn [Mon, 27 Feb 2017 03:01:08 +0000 (03:01 +0000)]
Merge "Fix videoStateToString for audio/paused state."
am:
89e7a888be
Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0
Tyler Gunn [Mon, 27 Feb 2017 02:59:21 +0000 (02:59 +0000)]
Merge "Format Japanese numbers using national format when in Japan." am:
050e5ddb4f
am:
8ac499fbe6
Change-Id: Ied615fbaf689a931a2b93785d944f2a8bd7f49dd
Tyler Gunn [Mon, 27 Feb 2017 02:55:24 +0000 (02:55 +0000)]
Merge "Fix videoStateToString for audio/paused state."
Tyler Gunn [Mon, 27 Feb 2017 02:54:49 +0000 (02:54 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
am:
050e5ddb4f
Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
Tyler Gunn [Mon, 27 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
Jack Yu [Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
am:
82c46d11f6
Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924
Jack Yu [Sat, 25 Feb 2017 02:46:58 +0000 (18:46 -0800)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
Chen Xu [Sat, 25 Feb 2017 01:17:31 +0000 (01:17 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api" am:
fcb37ffc60
am:
f4854018a2
Change-Id: Ie9ff472da7912042ec969268dd46d1b9a404526c
Treehugger Robot [Sat, 25 Feb 2017 01:13:28 +0000 (01:13 +0000)]
Merge "Added a settings for CMAS message broadcast"
Chen Xu [Sat, 25 Feb 2017 01:12:09 +0000 (01:12 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
am:
fcb37ffc60
Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
Etan Cohen [Fri, 24 Feb 2017 20:43:16 +0000 (12:43 -0800)]
[AWARE] Remove (hide) sendMessage with retryCount API
Remove the sendMessage(..., retryCount) API (the version
without retryCount) remains. Baseline API already retries
transmissions (at the PHY/MAC layers) - no reason to add
framework-layer retries.
Bug:
35755823
Test: unit tests and integration (sl4a) tests
Change-Id: I49d8bd1e836c09d56f3a9343313f5647eac5c32d
Amit Mahajan [Fri, 24 Feb 2017 20:53:35 +0000 (20:53 +0000)]
Merge "Mark oemhook related APIs @Deprecated." am:
79faa72eee
am:
4b026b656d
Change-Id: I9fca856876619c380529df90fdd86e276666dbb3
Amit Mahajan [Fri, 24 Feb 2017 20:48:10 +0000 (20:48 +0000)]
Merge "Mark oemhook related APIs @Deprecated."
am:
79faa72eee
Change-Id: Ia31c163fdd65f305095ca1749cbc457eea4b0ca8
Treehugger Robot [Fri, 24 Feb 2017 20:40:22 +0000 (20:40 +0000)]
Merge "Mark oemhook related APIs @Deprecated."
Josh Gao [Fri, 24 Feb 2017 20:33:00 +0000 (20:33 +0000)]
Merge "Open /data/anr/traces.txt with O_APPEND." am:
5bf8540194
am:
0b9df3a012
Change-Id: I2cc15a9391c8b7a1e8bd1af7d20db684ff95a6f4
Josh Gao [Fri, 24 Feb 2017 20:28:00 +0000 (20:28 +0000)]
Merge "Open /data/anr/traces.txt with O_APPEND."
am:
5bf8540194
Change-Id: Ie73b2930348d946a6f4504df190bd3e819043487
Josh Gao [Fri, 24 Feb 2017 20:17:22 +0000 (20:17 +0000)]
Merge "Open /data/anr/traces.txt with O_APPEND."
Josh Gao [Fri, 24 Feb 2017 02:46:49 +0000 (18:46 -0800)]
Open /data/anr/traces.txt with O_APPEND.
Should fix selinux denial:
audit(0.0:7893): avc: denied { write } for path="/data/anr/traces.txt" dev="sda35" ino=679938 scontext=u:r:crash_dump:s0 tcontext=u:object_r:anr_data_file:s0 tclass=file permissive=0
Bug:
35727090
Test: none
Change-Id: I5c131ca1ee48ed00934a9aa7c611ee35fc4f9f2a
Eric Laurent [Fri, 24 Feb 2017 19:49:55 +0000 (19:49 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic" am:
70bc4a8036
am:
330ac1223a
Change-Id: I23f1e0cf7938afbf18611191f12f68779b7c017e
Eric Laurent [Fri, 24 Feb 2017 19:45:28 +0000 (19:45 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
am:
70bc4a8036
Change-Id: Iac325d28a09f4ddceb93ec85beba0eabfd393992
Eric Laurent [Fri, 24 Feb 2017 19:36:28 +0000 (19:36 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
Mukesh Agrawal [Fri, 24 Feb 2017 19:36:23 +0000 (19:36 +0000)]
Merge "StateMachine: add getLogRecMaxSize()" am:
22e43471ed
am:
0a2d5cf7db
Change-Id: Id8a21420d17074e7331f8f67453fe09c338991ec
Mukesh Agrawal [Fri, 24 Feb 2017 19:32:03 +0000 (19:32 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
am:
22e43471ed
Change-Id: Iaab7955c0721e240487e8c842e994c90141d6013
Mukesh Agrawal [Fri, 24 Feb 2017 19:26:47 +0000 (19:26 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
Roozbeh Pournader [Thu, 23 Feb 2017 02:53:39 +0000 (18:53 -0800)]
Load hyphenation patterns for Bulgarian and Church Slavonic
Patterns for Bulgarian (bg) and Church Slavonic (cu) are now loaded
too.
Also make changes to fontchain_lint.py, so it knows the script for Bulgarian
and Church Slavonic is Cyrillic.
Test: make -j works and creates .hyb files for bg and cu
Change-Id: I0586f6c49380279ef88fe952b5cfd2d3594c5524
Alex Light [Fri, 24 Feb 2017 18:43:56 +0000 (18:43 +0000)]
Merge "Update api for InMemoryDexClassLoader" am:
2f40b2b302
am:
c878255b5f
Change-Id: Ifaf686ab006aee45447b3fb7c7da97f1a079dffd
Alex Light [Fri, 24 Feb 2017 18:39:00 +0000 (18:39 +0000)]
Merge "Update api for InMemoryDexClassLoader"
am:
2f40b2b302
Change-Id: I4c28a97869d17862076521c7fc22a96f9946d6b0
fionaxu [Sat, 18 Feb 2017 01:20:46 +0000 (17:20 -0800)]
move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs
Bug:
33679956
Test: Manual
Change-Id: I202398f868d35e7e9046e7cc41330a3c26dca0b0
Merged-in: Ie2b5d072406513f04676210d08c43d91623c3cd2
Treehugger Robot [Fri, 24 Feb 2017 18:32:21 +0000 (18:32 +0000)]
Merge "Update api for InMemoryDexClassLoader"
Alex Light [Fri, 24 Feb 2017 16:22:13 +0000 (08:22 -0800)]
Update api for InMemoryDexClassLoader
We changed the base class for InMemoryDexClassLoader to be
BaseDexClassLoader.
Test: m -j40 droid
Change-Id: Ibf9f8996a8b9a2feebbd42ec864fd1b08027a6ab
Jason Monk [Fri, 24 Feb 2017 15:22:39 +0000 (15:22 +0000)]
resolve merge conflicts of
1723bc14ebfd to stage-aosp-master
am:
4f458421b1
Change-Id: I5c2b3fb86d1b6629f407df8fb607de639d972260
Jason Monk [Fri, 24 Feb 2017 14:34:42 +0000 (09:34 -0500)]
resolve merge conflicts of
1723bc14ebfd to stage-aosp-master
Change-Id: I11054806dbd263b2adaedb21458c33b7407bb7d6
Jason Monk [Fri, 24 Feb 2017 14:13:59 +0000 (14:13 +0000)]
Merge "Data activity icon in statusbar"
Erik Kline [Fri, 24 Feb 2017 08:19:45 +0000 (08:19 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers" am:
35c89886c2
am:
279a4feb72
Change-Id: I7f9e1a775e08363d9006f1dbb7af61d0d8e41043
Erik Kline [Fri, 24 Feb 2017 08:15:19 +0000 (08:15 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
am:
35c89886c2
Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
Erik Kline [Fri, 24 Feb 2017 08:06:16 +0000 (08:06 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
Miao Wang [Fri, 24 Feb 2017 05:52:14 +0000 (05:52 +0000)]
Merge "Update RenderScript JNI code for Treble" am:
9017b25631
am:
76535e8888
Change-Id: I04dc6154e0c919a2a2c2c150b6877538b4e8da0a
Miao Wang [Fri, 24 Feb 2017 05:47:35 +0000 (05:47 +0000)]
Merge "Update RenderScript JNI code for Treble"
am:
9017b25631
Change-Id: I0cc281a372ec83d3731a83b0af5cc3a02b259a67
Miao Wang [Fri, 24 Feb 2017 05:39:14 +0000 (05:39 +0000)]
Merge "Update RenderScript JNI code for Treble"
Jack Yu [Thu, 23 Feb 2017 17:49:25 +0000 (09:49 -0800)]
Added a settings for CMAS message broadcast
This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.
Test: manual
bug:
34393649
Merged-In: Ic29be11b641f185219146d7fbb05561f5907ea76
Change-Id: Ic29be11b641f185219146d7fbb05561f5907ea76
OSDN Git Service
