OSDN Git Service
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: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: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"
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: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: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: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"
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: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: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: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: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 02:46:58 +0000 (18:46 -0800)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
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: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: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: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: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: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 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: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: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: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
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: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
Brad Ebinger [Thu, 23 Feb 2017 21:14:04 +0000 (13:14 -0800)]
Adds read/modify permission checks to ImsService
This change adds READ/MODIFY_PHONE_STATE permission checks
to the ImsService to ensure that processes without those
permissions do not access this service illegally.
Test: Manual
Change-Id: I7740a9a6b6a12d3f9162aa5d055e7770b05fdff1
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: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: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: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
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
Treehugger Robot [Thu, 23 Feb 2017 20:03:43 +0000 (20:03 +0000)]
Merge "reates base implementation of ImsService AIDLs"
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: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"
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
Abhishek Adappa [Wed, 11 Jan 2017 01:36:06 +0000 (17:36 -0800)]
Add a new ImsReasonInfo code
For IKEv2 authentication failure during ePDG tunnel establishment.
Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
Chen Xu [Thu, 23 Feb 2017 02:03:00 +0000 (02:03 +0000)]
Merge "renaming telephony internal hidden intents"
am:
09c663a84c
Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
Chen Xu [Thu, 23 Feb 2017 01:55:24 +0000 (01:55 +0000)]
Merge "renaming telephony internal hidden intents"
Brad Ebinger [Fri, 3 Feb 2017 00:21:22 +0000 (16:21 -0800)]
reates base implementation of ImsService AIDLs
This change introduces "base classes" of the AIDL interfaces that are
implemented in vendor provided ImsServices. This allows for new APIs
to be added to the AIDL files, along with stub implementation of those
AIDLs in the base classes. By extending from the base class, older
implementations of the AIDL interfaces will not need to be updated
when the interface changes.
This change also moves some of the com.android.ims classes from
frameworks/opt/net/ims to frameworks/base. Any class that will be
used in the new unbundled ImsService system will need to be in
the framework, as opposed to the optional library that they are
in now.
Bug:
30290416
Test: Manual
Change-Id: I4a186d8e910d6d4f711e983ec8d717fc5cbdefab
Brad Ebinger [Thu, 23 Feb 2017 00:03:47 +0000 (16:03 -0800)]
resolve merge conflicts of
ac9b2c4fab42 to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
Brad Ebinger [Wed, 22 Feb 2017 23:22:06 +0000 (23:22 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp"
Amin Shaikh [Fri, 3 Feb 2017 01:50:12 +0000 (17:50 -0800)]
Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.
Bug:
34745259
Bug:
35671673
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Merged-In: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Hall Liu [Wed, 22 Feb 2017 18:56:48 +0000 (18:56 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
am:
27ad05169e
Change-Id: I3fb3cb89b467e5df808967dcd478964a84e2e61f
Hall Liu [Wed, 22 Feb 2017 18:48:52 +0000 (18:48 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
Paul Duffin [Wed, 22 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
am:
f3f4775a35
Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
Paul Duffin [Mon, 20 Feb 2017 16:26:09 +0000 (16:26 +0000)]
Deprecate TestSuiteBuilder and related classes.
Deprecates com.android.internal.util.Predicate in favour of
java.util.function.Predicate.
Deprecates TestMethod and TestSuiteBuilder in favour of
Android Test Support Library.
Bug:
35089332
Test: make checkbuild
Change-Id: Id8b2be55925d7ca09750fc9681817793517ceb5d
Treehugger Robot [Wed, 22 Feb 2017 15:15:33 +0000 (15:15 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
Paul Duffin [Wed, 22 Feb 2017 11:42:46 +0000 (11:42 +0000)]
Fix build failure when using javac toolchain
The legacy-performance-test-hostdex library was built using the
BUILD_HOST_DALVIK_JAVA_LIBRARY macro (which creates a non-static
library) but is used with LOCAL_STATIC_JAVA_LIBRARIES which
requires a static library. That works with Jack but fails with
the javac toolchain.
This change switched to build legacy-performance-test-hostdex
using the BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY macro.
Bug:
30188076
Test: make checkbuild
Change-Id: I8d42c669e4ded3417ecdcb7b0251bc6346debd5d