OSDN Git Service
Alan Viverette [Thu, 16 Feb 2017 16:27:40 +0000 (11:27 -0500)]
Fix ShapeDrawable mutate, add clone() support to ArcShape, OvalShape
Also cleans up stray white space and fixes docs. Adds getters to ArcShape
properties so that we can write proper CTS tests.
Fixes:
35419960
Test: ArcShapeTest, OvalShape#testClone, ShapeDrawableTest
Change-Id: Icf1bae7f79f9294b2a60c49b85ce8749473ed61e
Erik Kline [Fri, 24 Feb 2017 08:24:51 +0000 (08:24 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers" am:
35c89886c2 am:
279a4feb72
am:
c239511cdb
Change-Id: I9a210b4896810e7365b2403495716395b3866650
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"
Siyamed Sinir [Fri, 24 Feb 2017 07:45:49 +0000 (07:45 +0000)]
Merge "Revert "Request re-layout after setText if layout width is 0""
Miao Wang [Fri, 24 Feb 2017 05:57:19 +0000 (05:57 +0000)]
Merge "Update RenderScript JNI code for Treble" am:
9017b25631 am:
76535e8888
am:
4f85dd686a
Change-Id: I095f455c3c8a5f23ed9b072523cd23103c5c19f1
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"
TreeHugger Robot [Fri, 24 Feb 2017 05:29:02 +0000 (05:29 +0000)]
Merge "Delete some more @removed APIs."
TreeHugger Robot [Fri, 24 Feb 2017 04:54:39 +0000 (04:54 +0000)]
Merge "Whitelist new CHANGE_OVERLAY_PACKAGES permission"
Siyamed Sinir [Fri, 24 Feb 2017 00:08:49 +0000 (00:08 +0000)]
Revert "Request re-layout after setText if layout width is 0"
This reverts commit
b4b8740aed4753152729f1630b4241dedcadc98d.
Reverts fix for bug
27995311.
Test: cts-tradefed run cts --test android.widget.cts.TextViewTest -m
CtsWidgetTestCases --skip-device-info --skip-preconditions
--skip-connectivity-check
Fixes:
34843459
Change-Id: I2cea04cd12953b110c59a5a84e9eea5060fc038d
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
TreeHugger Robot [Fri, 24 Feb 2017 03:47:45 +0000 (03:47 +0000)]
Merge "PIP: Address the comment from the previous CL"
TreeHugger Robot [Fri, 24 Feb 2017 03:47:19 +0000 (03:47 +0000)]
Merge "dumpProto fixed crypto performance dump fixed bug
35627933 Test: ran adb shell dumpsys fingerprint --proto > ~/Desktop/test.out protoc --decode_raw < ~/Desktop/test.out confirm that crypto output is fixed"
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
Jeff Sharkey [Fri, 24 Feb 2017 03:22:57 +0000 (20:22 -0700)]
Delete some more @removed APIs.
Test: builds, boots
Bug:
25434584
Change-Id: I34d5a67c3c96ee0fbe2f2b8ef1327348a8bef04f
TreeHugger Robot [Fri, 24 Feb 2017 03:19:52 +0000 (03:19 +0000)]
Merge "Update RenderScript JNI code for Treble"
TreeHugger Robot [Fri, 24 Feb 2017 03:16:07 +0000 (03:16 +0000)]
Merge "fallout of libandroid.so split"
Adam Lesinski [Fri, 24 Feb 2017 02:17:11 +0000 (18:17 -0800)]
Whitelist new CHANGE_OVERLAY_PACKAGES permission
The Shell application needs access to change which overlays are
enabled in OverlayManagerService.
Test: Manual: invoke adb exec-out cmd overlay enable some.package.name
when shell is not root (adb unroot on eng builds).
Change-Id: I1849f68e244cfc9b1e13eb0e673dde7be03cba6d
Chen Xu [Fri, 24 Feb 2017 02:44:03 +0000 (02:44 +0000)]
Merge "renaming telephony internal hidden intents" am:
6d198966fe am:
3b7643ceed
am:
894f17fdc0
Change-Id: I885615dda1831f0acc9007f81094ac14e1eb8cb6
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
Jaewan Kim [Fri, 24 Feb 2017 01:45:12 +0000 (10:45 +0900)]
PIP: Address the comment from the previous CL
This address the comments from the following CL
8af250efae3 PIP: Use resource to maintain settings class list to shift
PIP to left
Test: Manual test
Change-Id: Ib7cae7ba019018375e9c1e51f1a0ef7d91447d52
TreeHugger Robot [Fri, 24 Feb 2017 01:28:11 +0000 (01:28 +0000)]
Merge "Log rendering pipeline when initializing"
TreeHugger Robot [Fri, 24 Feb 2017 01:22:47 +0000 (01:22 +0000)]
Merge "Add new internal resolve method"
TreeHugger Robot [Fri, 24 Feb 2017 01:13:56 +0000 (01:13 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
Scott Main [Fri, 24 Feb 2017 01:04:35 +0000 (01:04 +0000)]
Merge "Add API 'since' tag for O dev preview (current.txt)"
TreeHugger Robot [Fri, 24 Feb 2017 01:02:20 +0000 (01:02 +0000)]
Merge "Allow system configs to be read from vendor partition"
TreeHugger Robot [Fri, 24 Feb 2017 00:41:58 +0000 (00:41 +0000)]
Merge "Fix mStringBlocks race in the AssetManager"
Andre Eisenbach [Fri, 24 Feb 2017 00:37:44 +0000 (00:37 +0000)]
Merge "resolve merge conflicts of
cbca6aa2f1df to master"
Jaewan Kim [Fri, 24 Feb 2017 00:28:58 +0000 (00:28 +0000)]
Merge "PIP: Use resource to maintain settings class list to shift PIP to left"
TreeHugger Robot [Fri, 24 Feb 2017 00:07:37 +0000 (00:07 +0000)]
Merge "OMS: integrate OverlayManagerService into framework"
Dimitry Ivanov [Thu, 23 Feb 2017 23:53:38 +0000 (15:53 -0800)]
resolve merge conflicts of
cbca6aa2f1df to master
Change-Id: I085e97b8281ca64fd73b23effdd9b1c5aa9afb06
Chris Craik [Tue, 21 Feb 2017 20:41:49 +0000 (12:41 -0800)]
Log rendering pipeline when initializing
Test: manual, boots
Change-Id: I6e544510053ecf2b397ac998bcc7be9c00295a7d
Todd Kennedy [Thu, 23 Feb 2017 18:32:18 +0000 (10:32 -0800)]
Add new internal resolve method
Instant apps are unique in that any application can start them
with a VIEW/BROWSABLE while only very few apps can see an
instant app using queryIntentActivites, etc... In order to
support this dichotomy, we need an internal hook to resolution
for activity start.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Bug:
25119046
Change-Id: If6974c09c733ff0417ef72cabb9d9e9aca86c37c
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
Mathias Agopian [Fri, 10 Feb 2017 02:48:21 +0000 (18:48 -0800)]
fallout of libandroid.so split
Test: compiled & booted
Bug:
35164655
Change-Id: I786167a21453e17493969cdacfc9d31bdb781d98
Treehugger Robot [Thu, 23 Feb 2017 23:21:09 +0000 (23:21 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
Jiaquan He [Thu, 23 Feb 2017 23:13:55 +0000 (23:13 +0000)]
Merge "Fix ColorStateList bug."
TreeHugger Robot [Thu, 23 Feb 2017 23:01:29 +0000 (23:01 +0000)]
Merge "Auto-fill logging improvements:"
Scott Main [Thu, 23 Feb 2017 22:51:06 +0000 (14:51 -0800)]
Add API 'since' tag for O dev preview (current.txt)
Change-Id: I10ffd161f9249794df7d263a11703fbca0d88451
Johan Redestig [Wed, 10 Aug 2016 12:57:27 +0000 (14:57 +0200)]
Fix mStringBlocks race in the AssetManager
There were a few places where access to the mStringBlocks were
not protected.
The crashes seen where similar to:
java.lang.NullPointerException: Attempt to invoke virtual method \
'java.lang.CharSequence android.content.res.StringBlock.get(int)' on a null object reference
at android.content.res.AssetManager.getResourceValue(AssetManager.java:222)
at android.content.res.ResourcesImpl.getValue(ResourcesImpl.java:188)
at android.content.res.Resources.loadXmlResourceParser(Resources.java:2110)
at android.content.res.Resources.getLayout(Resources.java:1111)
java.lang.NullPointerException: Attempt to invoke virtual method \
'java.lang.CharSequence android.content.res.StringBlock.get(int)' on a null object reference
at android.content.res.AssetManager.getPooledStringForCookie(AssetManager.java:312)
at android.content.res.TypedArray.loadStringValueAt(TypedArray.java:1212)
at android.content.res.TypedArray.getValueAt(TypedArray.java:1198)
at android.content.res.TypedArray.getColor(TypedArray.java:446)
What happened was that thread 1 was creating a new mStringBlocks in
makeStringBlocks while thread 2 was accessing mStringBlocks. The
makeStringBlocks starts off by overwriting mStringBlocks with a new
empty array and when thread 2 accessed its content NPE happened.
Bug:
30802713
Test: None (just added synchronization to help prevent races)
Change-Id: I810da26b161a6528b0dd241048dde5b239089244
Scott Main [Thu, 23 Feb 2017 22:42:06 +0000 (22:42 +0000)]
Merge "switch all droiddoc builds to use templates-sdk from doclava"
Chong Zhang [Thu, 23 Feb 2017 22:36:18 +0000 (22:36 +0000)]
Merge "MediaCas: add framework APIs"
Abhishek Adappa [Thu, 23 Feb 2017 22:32:50 +0000 (22:32 +0000)]
Merge "Add a new ImsReasonInfo code" am:
b4234e6af8 am:
bb59947d90
am:
44f4430953
Change-Id: Iaaa2f91f36f0f57a81a5f0e7781564296654a33a
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"
MÃ¥rten Kongstad [Thu, 2 Jun 2016 07:35:31 +0000 (09:35 +0200)]
OMS: integrate OverlayManagerService into framework
Hand over ownership of overlays to OverlayManagerService.
Changes to a package's overlays are propagated using the activity life
cycle. Affected activities will be recreated as needed. This provides a
well-defined point to modify an application's assets while the
application is paused.
Consolidate how overlays targeting the system and overlays targeting
regular applications are handled. Previously, system overlays were
handled as a special case. Now, everything is handled identically. As a
side effect, the call to idmap --scan during Zygote boot has become
obsolete and is removed.
Information on what overlays to use is recorded in
ApplicationInfo.resourceDirs. The PackageManagerService is responsible
for the creation of ApplicationInfo objects. The OverlayManagerService
is responsible for informing the PackageManagerService in advance about
what resourceDirs to use.
When launching an application, the ApplicationInfo is already populated
with up-to-date information about overlays.
When enabling or disabling an overlay for a running application, the
OverlayManagerService first notifies the PackageManagerService about the
updated resourceDirs. It then tells the ActivityManagerService to push
the new ApplicationInfo object to the application's ActivityThread.
Finally the application requests its ResourcesManager to create new
ResourcesImpl objects based on the updated paths.
Change-Id: Ib8afa05ccab4e2db558f89ce4423983c086bb61a
Co-authored-by: Martin Wallgren <martin.wallgren@sonymobile.com>
Signed-off-by: Zoran Jovanovic <zoran.jovanovic@sonymobile.com>
Bug:
31052947
Test: run tests from 'OMS: tests for OverlayManagerService'
Rebecca Silberstein [Thu, 23 Feb 2017 21:57:09 +0000 (21:57 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum" am:
84374678e0 am:
e1dd7de75e
am:
ded006f4cf
Change-Id: I8c41e4aff5734db561d2e63a7df344e292179832
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"
Scott Main [Tue, 21 Feb 2017 22:30:58 +0000 (14:30 -0800)]
switch all droiddoc builds to use templates-sdk from doclava
Change-Id: I9007f4d49a3076e8b38a2c97e936cf6d6710e87a
TreeHugger Robot [Thu, 23 Feb 2017 21:25:04 +0000 (21:25 +0000)]
Merge "Load splits on-demand"
TreeHugger Robot [Thu, 23 Feb 2017 21:24:35 +0000 (21:24 +0000)]
Merge "Fix unit test that failed due to incorrect refactor."
TreeHugger Robot [Thu, 23 Feb 2017 21:11:50 +0000 (21:11 +0000)]
Merge "Take another pass at detecting USB connections."
TreeHugger Robot [Thu, 23 Feb 2017 21:11:14 +0000 (21:11 +0000)]
Merge "Remove ContentProvider queries in updateTileData."
Svetoslav Ganov [Thu, 23 Feb 2017 21:03:40 +0000 (21:03 +0000)]
Merge "Ensure default and system set bits grandfathered"
TreeHugger Robot [Thu, 23 Feb 2017 21:03:28 +0000 (21:03 +0000)]
Merge "Revert "Remove abstract from AccessibilityService methods""
Jaekyun Seok [Thu, 16 Feb 2017 04:48:30 +0000 (13:48 +0900)]
Allow system configs to be read from vendor partition
Soc vendors also want to add their own configs like odms do.
Additionally they should be allowed to add their own app permission
configs because they can install their own apps in /vendor/app.
So Soc vendors should be able to add system configs around libs,
features, permissions and apps.
Additionally this CL modified codes to allow "privapp-permissions"
only on system partition because we won't allow apps on the partner
partitions to count as privileged.
Test: building succeeded and tested on sailfish.
Bug:
35369237
Change-Id: I7d84d6e351d9e7023931757082d9f661c5a9a80a
Svet Ganov [Thu, 23 Feb 2017 20:45:17 +0000 (12:45 -0800)]
Ensure default and system set bits grandfathered
We added the notion of a default and whether the system set
the setting. This is used for resetting the internal state and we need
to make sure this value is updated for the existing settings, otherwise
we would delete system set settings while they should stay unmodified.
Test: manual
bug:
35317326
Change-Id: Iaffde2e7acab53653fd38e669a644e654cc7cd7d
Paul Lawrence [Thu, 23 Feb 2017 20:56:36 +0000 (20:56 +0000)]
Merge "Use bionic's autogenerated whitelist policy" am:
dcd14de5f6 am:
82c92f94bf
am:
d82ce88b6c
Change-Id: Iba0e83f72931509331bd48fe85597c10ceec240e
TreeHugger Robot [Thu, 23 Feb 2017 20:54:02 +0000 (20:54 +0000)]
Merge "PlayerBase: reference to IAppOpsService may be null"
Amin Shaikh [Thu, 23 Feb 2017 20:47:46 +0000 (20:47 +0000)]
Merge changes from topic 'disabled-reason' am:
d0fc3f1383 am:
b858ffbe42
am:
a071d9693b
Change-Id: I1ebe58cc4c7162931ad8679f87ade288489d4e8b
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
Amin Shaikh [Thu, 23 Feb 2017 20:46:28 +0000 (20:46 +0000)]
Add a disabled reason for recommendation providers am:
a70bc57ef9 am:
df6f7b9388
am:
004a682135
Change-Id: I02a7adb0d31bef2efdda0a4bcf7168d41674b559
TreeHugger Robot [Thu, 23 Feb 2017 20:41:40 +0000 (20:41 +0000)]
Merge "Add metrics constant for Settings->Security->Encryption & credentials."
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
Jason Monk [Thu, 23 Feb 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Revert "Fix roaming getting stuck after changing sims""
Jason Monk [Thu, 23 Feb 2017 20:32:24 +0000 (20:32 +0000)]
Revert "Fix roaming getting stuck after changing sims"
This reverts commit
9d3dcdfe1c15ffa1c8d3694a4f2bf5e2280aa5ba.
Change-Id: I21739f73548be383221b1bec81a05e196fe0a690
Treehugger Robot [Thu, 23 Feb 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
Makoto Onuki [Thu, 23 Feb 2017 20:25:58 +0000 (20:25 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53 am:
89bb32fb0d am:
3fe290622f
am:
9bda68ffb7 -s ours
Change-Id: I49a1e8fc8d12b2d8a69f26e2cf280e127119a4fe
TreeHugger Robot [Thu, 23 Feb 2017 20:24:22 +0000 (20:24 +0000)]
Merge "AAPT2: Few tweaks to get shared-libraries working"
TreeHugger Robot [Thu, 23 Feb 2017 20:22:36 +0000 (20:22 +0000)]
Merge "Fix failing WifiConfigManagerTest test."
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:19:50 +0000 (20:19 +0000)]
Merge "reates base implementation of ImsService AIDLs" am:
b60869db12 am:
fe8d588dad
am:
fe2a74bfee
Change-Id: I9b7885ead16666b57e3b77b2bb868f81fb68de3b
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
Jason Monk [Thu, 23 Feb 2017 20:17:48 +0000 (20:17 +0000)]
Merge "Update clipboard icon for the tuner"
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
Jason Monk [Thu, 23 Feb 2017 20:14:39 +0000 (20:14 +0000)]
Merge "Fix roaming getting stuck after changing sims"
Evan Laird [Thu, 23 Feb 2017 20:14:12 +0000 (20:14 +0000)]
Merge "Fix qs_signal icon clipping"
Jason Monk [Thu, 23 Feb 2017 20:13:57 +0000 (20:13 +0000)]
Merge "Fix data disabled icon from not showing in status bar"
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"
TreeHugger Robot [Thu, 23 Feb 2017 20:01:01 +0000 (20:01 +0000)]
Merge "Update fill UI"
Evan Laird [Thu, 23 Feb 2017 20:00:46 +0000 (15:00 -0500)]
Fix qs_signal icon clipping
Test: visual
Change-Id: If212eefc9303590b7168432120c46bf07ac184d1
Fixes:
34799892