OSDN Git Service
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 [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
Erik Kline [Wed, 22 Feb 2017 03:58:24 +0000 (12:58 +0900)]
Update UpstreamNetworkMonitor to use custom Handlers
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32130437
Bug:
32163131
Change-Id: I2bc3f87cdf7fa6392b4750eb8adb4ea33c6a3f43
Miao Wang [Wed, 25 Jan 2017 02:58:17 +0000 (18:58 -0800)]
Update RenderScript JNI code for Treble
- Include rsApiStubs.h instead of rs.h, and remove unused
dependencies for rs.h in Android.mk.
- Remove libRSDriver.so from LOCAL_REQUIRED_MODULE, since it is not
required nor directly used by librs_jni.so.
- Fix the discrepancy in ElementGetNativeData and
ElementGetSubElements, respective to NDK APIs exposed in libRS.so.
rsApiStubs.h contains all public RenderScript APIs exposed in libRS.so.
It fixes the mismatch of the declarations and definitions of the two
functions mentioned above. And it does not rely on the auto generated
header (rsgApiFuncDecl.h) anymore.
Bug:
34396220
Test: mm
Merged-In: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Change-Id: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Chen Xu [Fri, 24 Feb 2017 02:38:56 +0000 (02:38 +0000)]
Merge "renaming telephony internal hidden intents" am:
6d198966fe
am:
3b7643ceed
Change-Id: I4b544145c59c7ba73a0187d320e01c56f9b63fe9
Chen Xu [Fri, 24 Feb 2017 02:33:53 +0000 (02:33 +0000)]
Merge "renaming telephony internal hidden intents"
am:
6d198966fe
Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
Chen Xu [Fri, 24 Feb 2017 02:24:42 +0000 (02:24 +0000)]
Merge "renaming telephony internal hidden intents"
fionaxu [Fri, 24 Feb 2017 02:06:52 +0000 (18:06 -0800)]
renaming telephony internal hidden intents
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.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD
Bug:
33679454
Test: manual
Change-Id: I7183493e2794a82e023bc4993aee328f24b2e7cb
Julius D'souza [Thu, 23 Feb 2017 23:01:10 +0000 (15:01 -0800)]
DO NOT MERGE: Add the option to skip the initial brightness
ramp when the screen turns on.
Bug:
35389235
Change-Id: I0bd94c927708c23985f2888d6fa2a1d11c28487e
mukesh agrawal [Fri, 24 Feb 2017 01:13:29 +0000 (17:13 -0800)]
StateMachine: add getLogRecMaxSize()
Add the getLogRecMaxSize() method, so that
WifiStateMachine tests can verify the log
record buffer size, without having to fill
the buffer.
Bug:
35399013
Test: compile
Change-Id: Ib1bd8d670b7b39e9f740a4dd92ea67463b179ce2
Amit Mahajan [Thu, 23 Feb 2017 20:07:46 +0000 (12:07 -0800)]
Mark oemhook related APIs @Deprecated.
Test: none
Bug:
34344851
Change-Id: I5358d94b3f4cce015effdb3a7517980f369a1224
Dimitry Ivanov [Thu, 23 Feb 2017 23:36:40 +0000 (23:36 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call" am:
0743d56e2b
am:
029170ee2b
Change-Id: Ia566854612ea9c9570fb8d7b6adc1a0e1e074d02
Dimitry Ivanov [Thu, 23 Feb 2017 23:30:16 +0000 (23:30 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
am:
0743d56e2b
Change-Id: I74deae8126109555bbbe57983ffd6a22ab50e303
Treehugger Robot [Thu, 23 Feb 2017 23:21:09 +0000 (23:21 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
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: I2d3a4ac9284a733010d74cb509237e35df17588f
Abhishek Adappa [Thu, 23 Feb 2017 22:27:07 +0000 (22:27 +0000)]
Merge "Add a new ImsReasonInfo code" am:
b4234e6af8
am:
bb59947d90
Change-Id: I06bd38225b0fcbd8619a5b5eb7d827cfba1c0cb0
Abhishek Adappa [Thu, 23 Feb 2017 22:22:40 +0000 (22:22 +0000)]
Merge "Add a new ImsReasonInfo code"
am:
b4234e6af8
Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
Dimitry Ivanov [Wed, 22 Feb 2017 23:39:42 +0000 (15:39 -0800)]
Add isBundled argument to LoadedApk.makePaths call
There is a disconnect between the way webview created
classloader and the way makePaths decides if paths are
intended for bundled app.
This change moves decision making out of makePaths method
which allows WebViewZygote to pass correct argument and
have makePath omit java.library.path for libPaths
Bug: http://b/
35426785
Test: manual
Change-Id: Iab5a18c0091d0193dafa750498eb00f378411ba0
(cherry picked from commit
638d81009918eae44eec3261e235b78eae44331d)
Treehugger Robot [Thu, 23 Feb 2017 22:14:20 +0000 (22:14 +0000)]
Merge "Add a new ImsReasonInfo code"
Rebecca Silberstein [Thu, 23 Feb 2017 21:52:34 +0000 (21:52 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum" am:
84374678e0
am:
e1dd7de75e
Change-Id: I9d3b69543b45dbf797d5fee0f8de51966ca4dacb
Rebecca Silberstein [Thu, 23 Feb 2017 21:46:51 +0000 (21:46 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
am:
84374678e0
Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
Rebecca Silberstein [Thu, 23 Feb 2017 21:29:02 +0000 (21:29 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
Paul Lawrence [Thu, 23 Feb 2017 20:46:41 +0000 (20:46 +0000)]
Merge "Use bionic's autogenerated whitelist policy" am:
dcd14de5f6
am:
82c92f94bf
Change-Id: I2995ab46372e10db9f879c359ead1ccbef9b45ae
Paul Lawrence [Thu, 23 Feb 2017 20:41:33 +0000 (20:41 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
am:
dcd14de5f6
Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
Amin Shaikh [Thu, 23 Feb 2017 20:41:12 +0000 (20:41 +0000)]
Merge changes from topic 'disabled-reason' am:
d0fc3f1383
am:
b858ffbe42
Change-Id: I5138cd1713ccecac8fa304275aec88734c040ffb
Amin Shaikh [Thu, 23 Feb 2017 20:39:57 +0000 (20:39 +0000)]
Add a disabled reason for recommendation providers am:
a70bc57ef9
am:
df6f7b9388
Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
Amin Shaikh [Thu, 23 Feb 2017 20:35:10 +0000 (20:35 +0000)]
Merge changes from topic 'disabled-reason'
am:
d0fc3f1383
Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
Amin Shaikh [Thu, 23 Feb 2017 20:33:59 +0000 (20:33 +0000)]
Add a disabled reason for recommendation providers
am:
a70bc57ef9
Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
Treehugger Robot [Thu, 23 Feb 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
Treehugger Robot [Thu, 23 Feb 2017 20:22:06 +0000 (20:22 +0000)]
Merge changes from topic 'disabled-reason'
* changes:
Fix failing WifiConfigManagerTest test.
Add a disabled reason for recommendation providers
Makoto Onuki [Thu, 23 Feb 2017 20:18:04 +0000 (20:18 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53 am:
89bb32fb0d
am:
3fe290622f
Change-Id: Ia96b9c9c7997c726da5ae0221bb4d2d41869deb2
Brad Ebinger [Thu, 23 Feb 2017 20:14:58 +0000 (20:14 +0000)]
Merge "reates base implementation of ImsService AIDLs" am:
b60869db12
am:
fe8d588dad
Change-Id: I3425819c9ca83577ea4946dae072d9816626d5e5
Makoto Onuki [Thu, 23 Feb 2017 20:12:53 +0000 (20:12 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53
am:
89bb32fb0d
Change-Id: I264cdae7f5db5e9b9ecb7ef93d60f977157e1512
Brad Ebinger [Thu, 23 Feb 2017 20:10:34 +0000 (20:10 +0000)]
Merge "reates base implementation of ImsService AIDLs"
am:
b60869db12
Change-Id: I6edf280213bee0756aad65148daafe3300849baa
Makoto Onuki [Thu, 23 Feb 2017 20:07:27 +0000 (20:07 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b
am:
f171c39e53
Change-Id: I69a9ece7da697e2a2fb979febad1af352713ccbe
Makoto Onuki [Thu, 23 Feb 2017 20:03:59 +0000 (20:03 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb
am:
7c6b2f4d8b
Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
Treehugger Robot [Thu, 23 Feb 2017 20:03:43 +0000 (20:03 +0000)]
Merge "reates base implementation of ImsService AIDLs"
Makoto Onuki [Thu, 23 Feb 2017 20:00:01 +0000 (20:00 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
am:
a08c6a1cfb
Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
Rebecca Silberstein [Tue, 24 Jan 2017 18:42:59 +0000 (10:42 -0800)]
wifi.proto: add SoftApReturnCode enum
SoftAp startup returns a failure mode if it does not start. This
additional information is useful in determining where we need to add
logging and retry logic to make SoftAp mode more reliable. The
combination of Failure + failure reason is mapped to an enum defined for
wifi metrics.
Bug:
30899122
Test: checked WifiMetricsProto.java for the enum
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I944e3e249d3be5738352b26a1d12139fdd50bf80
Amin Shaikh [Thu, 23 Feb 2017 18:08:10 +0000 (10:08 -0800)]
Fix failing WifiConfigManagerTest test.
Bug:
35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
Paul Duffin [Thu, 23 Feb 2017 13:50:05 +0000 (13:50 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes." am:
a26000b8f5
am:
fd61eb1e39
Change-Id: I23f137865997ca9ce4aa229c9329d8ea9fbcb6ee
Paul Duffin [Thu, 23 Feb 2017 13:49:07 +0000 (13:49 +0000)]
Merge "Fix build failure when using javac toolchain" am:
c098bea921
am:
5da6f4fbd1
Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca
Paul Duffin [Thu, 23 Feb 2017 13:44:24 +0000 (13:44 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
am:
a26000b8f5
Change-Id: Ia9d491bd72f2a9f08838e298aaf4de5de28c7d4f
Paul Duffin [Thu, 23 Feb 2017 13:43:07 +0000 (13:43 +0000)]
Merge "Fix build failure when using javac toolchain"
am:
c098bea921
Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10
Paul Duffin [Thu, 23 Feb 2017 13:36:30 +0000 (13:36 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
Paul Duffin [Thu, 23 Feb 2017 13:34:38 +0000 (13:34 +0000)]
Merge "Fix build failure when using javac toolchain"
Makoto Onuki [Thu, 28 Jul 2016 20:10:42 +0000 (13:10 -0700)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
Bug
30475753
Bug
35667752
Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit
8198deacb52eb082ae9f0a5658d594dc9b689882)
Kenneth Westin [Thu, 28 Nov 2013 15:29:40 +0000 (16:29 +0100)]
Data activity icon in statusbar
Display data activity icon for Wi-Fi and mobile data
respectively in statusbar
Bug:
30849089
Test: manual - go to Settings > Developer options > Demo mode and then
enable both "Enable demo mode" and "Show demo mode"
Change-Id: I16e880ffb97666a6c6507b9cc8c99bf580972207
OSDN Git Service
