OSDN Git Service
TreeHugger Robot [Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)]
Merge "Remove @SystemApi from the fields of R.styleable"
Hall Liu [Fri, 12 Jan 2018 23:11:03 +0000 (23:11 +0000)]
Merge "Use proper classloader when reading from parcel" am:
d3cb6380a4 am:
03a515aed4
am:
ff63c83237
Change-Id: If91f694b4f9c396e118dcf47ebaa480ff4cd44d0
Hall Liu [Fri, 12 Jan 2018 23:01:16 +0000 (23:01 +0000)]
Merge "Use proper classloader when reading from parcel" am:
d3cb6380a4
am:
03a515aed4
Change-Id: I65070de075e8d09512d771c805c82043f04b3275
Hall Liu [Fri, 12 Jan 2018 22:48:14 +0000 (22:48 +0000)]
Merge "Use proper classloader when reading from parcel"
am:
d3cb6380a4
Change-Id: I79c21859aa657b7a61e5cc8e7d60f79f736f34be
TreeHugger Robot [Fri, 12 Jan 2018 22:27:35 +0000 (22:27 +0000)]
Merge "Remove bogus SkASSERT"
TreeHugger Robot [Fri, 12 Jan 2018 22:26:03 +0000 (22:26 +0000)]
Merge "Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the feedback from API council"
Tony Mak [Fri, 12 Jan 2018 12:10:17 +0000 (12:10 +0000)]
Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ...
the feedback from API council
trySetQuietModeEnabled will be kept for a while until next
Launcher prebuilt is dropped.
FIXES:
71818127
Test: Build
Change-Id: I3d4fd64862c7d924b8da630522a30a3899676b4b
TreeHugger Robot [Fri, 12 Jan 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Skip "sync didn't run" WTF when job is stopped too soon"
Jeff Hamilton [Fri, 12 Jan 2018 21:55:33 +0000 (21:55 +0000)]
Merge "Minor LoadedApk refactoring." am:
6ca155f8c2 am:
e6fee297a2
am:
2fd131b492 -s ours
Change-Id: Idd758a3b1e0f18812c67187ab820859b239d1834
Jeff Hamilton [Fri, 12 Jan 2018 21:43:44 +0000 (21:43 +0000)]
Merge "Minor LoadedApk refactoring." am:
6ca155f8c2
am:
e6fee297a2
Change-Id: I919f7e7e11b64f6155919f7ea631f3f6fd84ce03
TreeHugger Robot [Fri, 12 Jan 2018 21:32:55 +0000 (21:32 +0000)]
Merge "Add target package to VisualVoicemailFilterSettings."
Jeff Hamilton [Fri, 12 Jan 2018 21:30:13 +0000 (21:30 +0000)]
Merge "Minor LoadedApk refactoring."
am:
6ca155f8c2
Change-Id: I96fb0215bc09e2c190900be47dcca4de2c752d47
Kodlee Yin [Fri, 12 Jan 2018 21:20:54 +0000 (21:20 +0000)]
Merge "Create Notification.Action.SemanticAction intdef."
TreeHugger Robot [Fri, 12 Jan 2018 21:04:20 +0000 (21:04 +0000)]
Merge "Fix destruction order of NinePatchPeeker"
TreeHugger Robot [Fri, 12 Jan 2018 21:03:24 +0000 (21:03 +0000)]
Merge "Create an empty stub for Vulkan readback"
TreeHugger Robot [Fri, 12 Jan 2018 20:57:05 +0000 (20:57 +0000)]
Merge "Add another pass of commont lint rules."
TreeHugger Robot [Fri, 12 Jan 2018 20:56:43 +0000 (20:56 +0000)]
Merge "Expose Global.LOW_POWER_MODE for CTS"
Hall Liu [Fri, 12 Jan 2018 20:56:36 +0000 (20:56 +0000)]
Merge "Use proper classloader when reading from parcel"
Treehugger Robot [Fri, 12 Jan 2018 20:52:14 +0000 (20:52 +0000)]
Merge "Minor LoadedApk refactoring."
Makoto Onuki [Thu, 11 Jan 2018 23:51:23 +0000 (15:51 -0800)]
Skip "sync didn't run" WTF when job is stopped too soon
Job scheduler may call onStopJob() right after onStartJob() when a
constraint is no longer satisfied. In that case this WTF shouldn't fire.
Bug:
71866667
Test: manual test (trigger some syncs)
Change-Id: I2ba3b076b60692b02019f3e74b384aea63e27bb4
TreeHugger Robot [Fri, 12 Jan 2018 20:09:34 +0000 (20:09 +0000)]
Merge "Force verifying updated priv apps on boot if enabled"
TreeHugger Robot [Fri, 12 Jan 2018 20:00:34 +0000 (20:00 +0000)]
Merge "DND alarms only will not mute alarms nor media"
TreeHugger Robot [Fri, 12 Jan 2018 19:54:55 +0000 (19:54 +0000)]
Merge "Keep PowerUI low-battery logic in sync with BatteryService."
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:52:48 +0000 (19:52 +0000)]
Merge "Add dependencies of EuiccCard." am:
90b4e47d94 am:
4f217d740a
am:
e03f92daaf
Change-Id: Ibc22bc94851e4faf6066f44baebaf2da8eec586e
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:46:10 +0000 (19:46 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am:
22f4a681f9 -s ours am:
1ac5184053
am:
5a26231e39 -s ours
Change-Id: I52f02086bc92ac347249e935697fadcf6fb4c410
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:42:42 +0000 (19:42 +0000)]
Merge "Add dependencies of EuiccCard." am:
90b4e47d94
am:
4f217d740a
Change-Id: I874b4244dd0c79c1bee34480c34d6ee6ac9e0855
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:36:56 +0000 (19:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am:
22f4a681f9 -s ours
am:
1ac5184053
Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:27:22 +0000 (19:27 +0000)]
Merge "Add dependencies of EuiccCard."
am:
90b4e47d94
Change-Id: I68393a909c22a49a3905dd2b50577c4c88655ca1
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:22:13 +0000 (19:22 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
am:
22f4a681f9 -s ours
Change-Id: I8fdb25956710600d75a0f2eb0bbf82a94fc78131
TreeHugger Robot [Fri, 12 Jan 2018 19:16:22 +0000 (19:16 +0000)]
Merge "Battery saver: Expose location power save mode as system API"
Jeff Sharkey [Fri, 12 Jan 2018 19:12:27 +0000 (12:12 -0700)]
Add another pass of commont lint rules.
-- Parcelables should be inflated through CREATOR
-- Methods with no arguments should throw ISE
-- Examine constructors for Executors
-- Listeners should always be last for lambdas
-- Verify naming of UserHandle methods
-- Verify naming of Params objects
-- Verify naming of Context service constants
-- Verify tense of enabled methods
Better exception tracking.
Test: manual inspection
Bug:
37784434,
37749454,
37705832
Bug:
37705176,
37536230,
37533040,
71866617
Change-Id: If2f19784c46a4d99f54577a7365babfd357ca3f7
Todd Kennedy [Fri, 12 Jan 2018 19:11:56 +0000 (19:11 +0000)]
Merge "Revert "Temporary debugging""
Todd Kennedy [Fri, 12 Jan 2018 19:11:26 +0000 (19:11 +0000)]
Revert "Temporary debugging"
This reverts commit
c170e20c6f8ff40876887f3d74e2caec0caef6f5.
Change-Id: I251b6e108b386559605973ca0ef21d805ffe00a3
Jeff Hamilton [Tue, 24 Oct 2017 19:20:43 +0000 (15:20 -0400)]
Minor LoadedApk refactoring.
- Rename varaibles holding LoadedApk to make the code easier to read.
- Move resource creation into LoadedApk, consolidating the logic.
(cherry picked from commit
7541ca4d1aa48e3110187a83a8dccbfa72084148)
Test: manual
Merged-In: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Change-Id: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Leon Scroggins III [Fri, 12 Jan 2018 18:11:10 +0000 (13:11 -0500)]
Fix destruction order of NinePatchPeeker
Test: build with SK_DEBUG
SkAndroidCodec is going to unref the NinePatchPeeker, so make sure it
gets destructed first, before destructing the NinePatchPeeker.
Change-Id: I5bb412f1a20abd44004552e0d788a016bc4a24ae
Makoto Onuki [Fri, 12 Jan 2018 18:32:32 +0000 (10:32 -0800)]
Expose Global.LOW_POWER_MODE for CTS
Bug:
68769804
Test: atest CtsBatterySavingTestCases
Change-Id: I7dfac2e0c549c91cd368ca955fff71e15d585b34
Leon Scroggins III [Fri, 12 Jan 2018 18:25:40 +0000 (13:25 -0500)]
Remove bogus SkASSERT
Test: No change in behavior, no new tests
SkASSERT compiles to nothing in typical Android builds, but with
SK_DEBUG defined it is an assert. This assert attempts to call a method
that no longer exists. Remove it.
Change-Id: I7047bb66c4cc0f0bdd6a84562247eed48944739e
Kodlee Yin [Thu, 21 Dec 2017 22:07:15 +0000 (22:07 +0000)]
Create Notification.Action.SemanticAction intdef.
Currently, Notification.Action has no indication of what it will do
when the associated PendingIntent is triggered. SemanticAction will
allow app developers to specify what the Action will do. This is
useful, for example, in the case where a user wants to answer an
incoming message in a hands-free manor. As, potentially, the
Notification may contain multiple actions like Reply, Mark as Read,
etc, this hands-free application would need to differentiate the
reply Action from the Mark as Read action. SemanticAction would
provide a means to do so.
Test: runtest -x
core/tests/coretests/src/android/app/NotificationTest.java
Bug:
67717177
Bug:
70859253
Change-Id: I8179afdd5da77be0037a8c03e125d8178cecc568
TreeHugger Robot [Fri, 12 Jan 2018 18:17:26 +0000 (18:17 +0000)]
Merge "Follow some slice refactors"
Victor Hsieh [Fri, 6 Oct 2017 21:44:52 +0000 (14:44 -0700)]
Force verifying updated priv apps on boot if enabled
If ro.apk_verity.mode is non-zero (default 0), package manager
will force verifying updated priv apps in /data, and make sure the
certificate matches the original one in /system, which we trust.
Test: logcat shows force collecting cert only if enabled
Bug:
30972906
Change-Id: I33f98930aaaaf76dbe2c0bc664e841f7892eb00e
Izabela Orlowska [Fri, 12 Jan 2018 18:06:40 +0000 (18:06 +0000)]
Merge "AAPT2: always compile 9patch files"
Holly Jiuyu Sun [Fri, 12 Jan 2018 17:18:03 +0000 (17:18 +0000)]
Merge "Add dependencies of EuiccCard."
Stan Iliev [Fri, 12 Jan 2018 16:50:29 +0000 (11:50 -0500)]
Create an empty stub for Vulkan readback
Create a stub for Vulkan readback. This avoids crashing,
because OpenGL readback does not work for Vulkan.
Test: Ran calc and gmail apps with skiavk pipeline.
Change-Id: I11cddde0a1efae1aa549e7a47d01051ec975f470
Badhri Jagan Sridharan [Fri, 12 Jan 2018 15:36:08 +0000 (15:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from
30b9adfad1c5055044f0b585782b10f764e0ddf9
The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.
Also added svc command for this so it can be
used and tested while the UI is worked on.
Bug:
62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern
Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
Sami Kyostila [Fri, 12 Jan 2018 15:03:22 +0000 (15:03 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint" am:
f0561142f3 am:
8f919b8c5b
am:
0944889164 -s ours
Change-Id: I1dc35e30d0eb333a96a0e6b045ec7ebe43fb9a5b
Beverly [Thu, 11 Jan 2018 20:28:33 +0000 (15:28 -0500)]
DND alarms only will not mute alarms nor media
Test: runtest -x frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: Id95912059e67107e8bb2fd9a77709f1ee3c183b2
Fixes:
71779870
Sami Kyostila [Fri, 12 Jan 2018 14:47:24 +0000 (14:47 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint" am:
f0561142f3
am:
8f919b8c5b
Change-Id: Ic8e741ec39fc83cdd64ce313d5d66fdbaa1e7ebc
Izabela Orlowska [Fri, 12 Jan 2018 14:24:09 +0000 (14:24 +0000)]
AAPT2: always compile 9patch files
Test: existing tests
Bug:
70578281
Change-Id: I7ffcbdd664108348182e71d01b1680e2399ec37c
Jason Monk [Wed, 10 Jan 2018 01:37:27 +0000 (20:37 -0500)]
Follow some slice refactors
Test: make
Bug:
68378561
Change-Id: Ifcf2b426f4984d8dda257b55e59d6da7e8d38237
Sami Kyostila [Fri, 12 Jan 2018 14:16:10 +0000 (14:16 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
am:
f0561142f3
Change-Id: I4c707c676f03048b9130b140c25b3b9c58ec06ce
Narayan Kamath [Fri, 12 Jan 2018 13:18:57 +0000 (13:18 +0000)]
Merge "BatteryStats: Remove dead code."
Treehugger Robot [Fri, 12 Jan 2018 12:39:35 +0000 (12:39 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Joachim Sauer [Fri, 12 Jan 2018 11:25:32 +0000 (11:25 +0000)]
Merge "Add default value for new time zone picker flag."
Sami Kyostila [Thu, 11 Jan 2018 00:12:14 +0000 (00:12 +0000)]
base: Convert libs/services/Android.mk into a blueprint
Convert libs/services/Android.mk into a blueprint module so it can be
linked by other blueprint modules.
Test: mmm frameworks/base
Change-Id: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Merged-In: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Sami Kyostila [Fri, 12 Jan 2018 11:03:23 +0000 (11:03 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Richard Ledley [Fri, 12 Jan 2018 10:40:20 +0000 (10:40 +0000)]
Merge "Make Linkify links clickable in nonselectable text."
Chalard Jean [Fri, 12 Jan 2018 09:11:07 +0000 (09:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e am:
a3373bd461
am:
176adeaeda
Change-Id: I81ee1269db73a158eedcc41a6d426abfb9130783
Chalard Jean [Fri, 12 Jan 2018 08:46:39 +0000 (08:46 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e
am:
a3373bd461
Change-Id: Ie8d38267581ab3e1bdf4b5373487a2375f8649ed
Chalard Jean [Fri, 12 Jan 2018 08:32:34 +0000 (08:32 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
am:
2fef505e1e
Change-Id: I10be317ba9e6ac1fc6c30eda3db2c3b6b4adabe0
Hyunyoung Song [Fri, 12 Jan 2018 06:11:43 +0000 (06:11 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584 am:
3aab9561b2
am:
7ca6bb95de
Change-Id: I449dd9403f7f9eeb92def3ce7162be07971399e2
Hyunyoung Song [Fri, 12 Jan 2018 05:55:42 +0000 (05:55 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584
am:
3aab9561b2
Change-Id: I554c6f320ec32b0151097701a5ff3a8d48161d7f
TreeHugger Robot [Fri, 12 Jan 2018 05:47:04 +0000 (05:47 +0000)]
Merge "Big RecoverableKeyStoreLoader refactoring."
Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607
am:
69d240d584
Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am:
48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Chalard Jean [Fri, 12 Jan 2018 05:11:29 +0000 (05:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
TreeHugger Robot [Fri, 12 Jan 2018 04:21:26 +0000 (04:21 +0000)]
Merge "Update comments and bump batterystats version to 30."
TreeHugger Robot [Fri, 12 Jan 2018 04:00:58 +0000 (04:00 +0000)]
Merge "Add more WTFs to investigate TIME_TICK issue"
TreeHugger Robot [Fri, 12 Jan 2018 03:18:15 +0000 (03:18 +0000)]
Merge "Add strings for Wifi Wake enabled notifications."
Andreas Gampe [Fri, 12 Jan 2018 02:58:14 +0000 (02:58 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate" am:
5edae415b0 am:
75dc3e9cf4
am:
07903b8ded
Change-Id: Idbfd80b32c27cfd2d24b37b5b868820e6ed7a283
Andreas Gampe [Fri, 12 Jan 2018 02:42:43 +0000 (02:42 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate" am:
5edae415b0
am:
75dc3e9cf4
Change-Id: Ifbe406bda739b3689ca9ed95493a8eca7a9276ae
Dmitry Dementyev [Thu, 11 Jan 2018 21:53:52 +0000 (13:53 -0800)]
Big RecoverableKeyStoreLoader refactoring.
The change is based on API review.
1) package and class names update
2) Builders for Parcelables.
3) Use Constant for RECOVER_KEYSTORE permission defined in
android.Manifest.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I49f80acbb6dc0eb6d049e18e8cb0d1aa326dadb2
TreeHugger Robot [Fri, 12 Jan 2018 02:37:13 +0000 (02:37 +0000)]
Merge "AAPT2: Allow compatible duplicate Attributes"
Andreas Gampe [Fri, 12 Jan 2018 02:32:15 +0000 (02:32 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
am:
5edae415b0
Change-Id: Idef313e1a0c1a69434783da2441a84aa6e12409e
Jerry Zhang [Fri, 12 Jan 2018 02:22:34 +0000 (02:22 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver" am:
68ad3d119c -s ours am:
da57c7d0e9
am:
6a233cce6f -s ours
Change-Id: I7ed8f8fec7885d7f8a353d0120a05bbd7da85a1e
Jerry Zhang [Fri, 12 Jan 2018 01:48:01 +0000 (01:48 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver" am:
68ad3d119c -s ours
am:
da57c7d0e9
Change-Id: Ifaab0c2d5265ccfd148edbc77668c67724de915e
Jerry Zhang [Fri, 12 Jan 2018 01:32:14 +0000 (01:32 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
am:
68ad3d119c -s ours
Change-Id: Icbc53b1d1c65b60dd128f4d3f3b4e59367f4a3a1
Hall Liu [Fri, 12 Jan 2018 01:23:40 +0000 (17:23 -0800)]
Use proper classloader when reading from parcel
Use the proper classloader when loading ImsStreamMediaProfile from a
parcel.
Bug:
71873453
Test: manual
Change-Id: Idf60f18b5d25b4c8eae225cb92a5391303c86d3b
Chavi Weingarten [Fri, 12 Jan 2018 01:18:08 +0000 (01:18 +0000)]
Merge changes from topic "fixTurnOnScreen"
* changes:
Remove TURN_ON_SCREEN from bulkUpdate and set mTurnOnScreen.
Revert "Revert "Call prepareSurfaces in applySurfacesChangesTransaction""
Revert "Revert "Revert "Revert "Avoid setting size/position on Transaction if not needed""""
Oscar Shu [Fri, 12 Jan 2018 01:12:36 +0000 (01:12 +0000)]
Merge "Delete WifiManager API - getConnectionStatistics"
TreeHugger Robot [Fri, 12 Jan 2018 00:54:34 +0000 (00:54 +0000)]
Merge "pull absolute value for cpu time per frequency."
Dmitry Dementyev [Fri, 12 Jan 2018 00:46:34 +0000 (00:46 +0000)]
Merge "Mark current recoverable keystore snapshot as outdated in a few events:"
zhouwenjie [Thu, 11 Jan 2018 23:21:27 +0000 (15:21 -0800)]
Update comments and bump batterystats version to 30.
Bug:
70808931
Bug:
31866283
Test: build Android
Change-Id: I8238c3135e79442ede97b87933dab85d8ff71134
Grace Chen [Fri, 12 Jan 2018 00:24:06 +0000 (00:24 +0000)]
Merge "Make setSimPowerState systemAPI"
Amit Mahajan [Fri, 12 Jan 2018 00:16:13 +0000 (00:16 +0000)]
Merge "Add new config for number of physical SIM slots on the device." am:
61fa313810 am:
6d9869afad
am:
fbee406cac -s ours
Change-Id: I024679d585b88cb121141ad5caf62d97efb0eb58
Phil Weaver [Fri, 12 Jan 2018 00:10:33 +0000 (00:10 +0000)]
Merge "Fix for bad merge between ag/
2455811 and ag/
3424187"
TreeHugger Robot [Fri, 12 Jan 2018 00:04:33 +0000 (00:04 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
Eugene Susla [Fri, 12 Jan 2018 00:02:22 +0000 (16:02 -0800)]
Fix for bad merge between ag/
2455811 and ag/
3424187
Test: presubmit
Change-Id: Ib0b5d54cf94e2998eeb661fc57e9d0bfb2e1afdc
chaviw [Thu, 11 Jan 2018 19:24:08 +0000 (11:24 -0800)]
Remove TURN_ON_SCREEN from bulkUpdate and set mTurnOnScreen.
If TURN_ON_SCREEN is added to the bulkUpdate flags, there's a
possibility it can get cleared before it's actually used. Instead,
just set the mService.mTurnOnScreen flag directly so it only gets
cleared when it's used.
Test: Windows with turnOnScreen flag work correctly now.
Test: ActivityManagerActivityVisibilityTests.testTurnScreenOnActivity
Test: go/wm-smoke
Fixes:
71789344
Change-Id: I7aba2bb8c7c960216df79b59b11e6efb552ed2cb
Amit Mahajan [Fri, 12 Jan 2018 00:01:33 +0000 (00:01 +0000)]
Merge "Add new config for number of physical SIM slots on the device." am:
61fa313810
am:
6d9869afad
Change-Id: Ifed6cc6b982f322a479882b6465d1b473faaee65
Treehugger Robot [Thu, 11 Jan 2018 23:52:46 +0000 (23:52 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
Jerry Zhang [Thu, 11 Jan 2018 23:50:34 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
Amit Mahajan [Thu, 11 Jan 2018 23:50:28 +0000 (23:50 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
am:
61fa313810
Change-Id: I85e549568fd7e6cd2397d2162e53308b89f7c1b0
Makoto Onuki [Thu, 11 Jan 2018 22:48:20 +0000 (14:48 -0800)]
Keep PowerUI low-battery logic in sync with BatteryService.
BatteryService has been updated already.
Bug:
71707409
Test: Manual test with dumpsys activity service com.android.systemui/.SystemUIService
Change-Id: I5a54a209b4929bf70a665e3b539a63d06eca61d4
Makoto Onuki [Thu, 11 Jan 2018 00:12:39 +0000 (16:12 -0800)]
Add more WTFs to investigate TIME_TICK issue
Bug:
70670726
Test: Manual test
Change-Id: Id41431be777c69e553e0d51906ec5b48401f7bd3
Android Build Merger (Role) [Thu, 11 Jan 2018 23:23:56 +0000 (23:23 +0000)]
Merge "Merge "Add EuiccCardManager and EuiccCardController." am:
ec25ea1520 am:
edc14bd3c4 am:
613e01227b -s ours"
Holly Jiuyu Sun [Thu, 11 Jan 2018 23:22:38 +0000 (23:22 +0000)]
Merge "Add EuiccCardManager and EuiccCardController." am:
ec25ea1520 am:
edc14bd3c4
am:
613e01227b -s ours
Change-Id: Iadf260311fc79ed49bbd39f1f3b3a0bed9c0ddc6
TreeHugger Robot [Thu, 11 Jan 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Moves instant app install checks to install time"
Selim Gurun [Thu, 11 Jan 2018 23:16:04 +0000 (23:16 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api" am:
ff9bc3a88c am:
6dc20d40fd
am:
54087cb8cb
Change-Id: I1a733b7f2567ff7821436d2c331a0a0cd8276e91