OSDN Git Service

android-x86/frameworks-base.git
7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 18 Mar 2017 08:21:03 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I820e686def44fb4442c531f0c7fac97094fc8af4
Auto-generated-cl: translation import

7 years agoMerge "Fix NPE when config is updated before ViewRootImpl is set"
TreeHugger Robot [Sat, 18 Mar 2017 01:33:07 +0000 (01:33 +0000)]
Merge "Fix NPE when config is updated before ViewRootImpl is set"

7 years agoMerge "Update Emoji.java to use ICU"
TreeHugger Robot [Sat, 18 Mar 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Update Emoji.java to use ICU"

7 years agoMerge "Correctly check expired jobs against active ones"
Chris Tate [Sat, 18 Mar 2017 00:39:53 +0000 (00:39 +0000)]
Merge "Correctly check expired jobs against active ones"

7 years agoMerge "Warn when ActivityManagerService.dumpStackTraces times out"
Brian Carlstrom [Sat, 18 Mar 2017 00:39:47 +0000 (00:39 +0000)]
Merge "Warn when ActivityManagerService.dumpStackTraces times out"

7 years agoMerge "Update battery settings summary text."
Doris Ling [Sat, 18 Mar 2017 00:39:04 +0000 (00:39 +0000)]
Merge "Update battery settings summary text."

7 years agoMerge changes Ic359aaee,Id7aba066
TreeHugger Robot [Sat, 18 Mar 2017 00:05:12 +0000 (00:05 +0000)]
Merge changes Ic359aaee,Id7aba066

* changes:
  AOD: Use color filter to invert icons for AOD
  NotificationWrappers: Factor out doze treatment

7 years agoMerge changes Iab3f9914,I5d5da5e7
TreeHugger Robot [Fri, 17 Mar 2017 23:57:06 +0000 (23:57 +0000)]
Merge changes Iab3f9914,I5d5da5e7

* changes:
  Average scan results for AccessPoints.
  Fix broken AccessPointTests.

7 years agoFix NPE when config is updated before ViewRootImpl is set
Andrii Kulian [Fri, 17 Mar 2017 21:58:36 +0000 (14:58 -0700)]
Fix NPE when config is updated before ViewRootImpl is set

If activity received a configuration change before it had its
ViewRootImpl initialize, then there was a NPE when trying to
notify the ViewRootImpl instance about latest changes.

Bug: 36396248
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: #testLaunchWithUiModeChange
Test: Launch AndroidAuto app
Change-Id: I71e0f316f885a30dadce388bbd3d9f21f419076b

7 years agoMerge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b am: 4aadda1902
fionaxu [Fri, 17 Mar 2017 23:50:47 +0000 (23:50 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b am: 4aadda1902
am: 606f1ae931

Change-Id: I345b2853acca9e0165c2bf26d885ff794b734d69

7 years agoMerge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b
fionaxu [Fri, 17 Mar 2017 23:44:09 +0000 (23:44 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b
am: 4aadda1902

Change-Id: I5c01a75cbb65b8374548c18c5139f9d892e14f49

7 years agoMerge "remove deprecated SIM_ACTIVATION_REQUEST intent"
fionaxu [Fri, 17 Mar 2017 23:34:49 +0000 (23:34 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
am: 7f8d27f84b

Change-Id: Ia1216368a2a2a4959283d95bbc4be26789f151f6

7 years agoMerge "Getting ephemeral flag from PackageManager when UidRecord is null"
TreeHugger Robot [Fri, 17 Mar 2017 23:25:15 +0000 (23:25 +0000)]
Merge "Getting ephemeral flag from PackageManager when UidRecord is null"

7 years agoMerge "remove deprecated SIM_ACTIVATION_REQUEST intent"
Treehugger Robot [Fri, 17 Mar 2017 23:24:28 +0000 (23:24 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"

7 years agoMerge "format cleanup(intellij)"
TreeHugger Robot [Fri, 17 Mar 2017 23:23:56 +0000 (23:23 +0000)]
Merge "format cleanup(intellij)"

7 years agoMerge "Compile secondary dex files according to REASON_BACKGROUND_DEXOPT"
Calin Juravle [Fri, 17 Mar 2017 23:22:41 +0000 (23:22 +0000)]
Merge "Compile secondary dex files according to REASON_BACKGROUND_DEXOPT"

7 years agoMerge changes from topic 'configForSplit'
Adam Lesinski [Fri, 17 Mar 2017 23:19:04 +0000 (23:19 +0000)]
Merge changes from topic 'configForSplit'

* changes:
  libandroidfw: Search all packages for an identifier
  AAPT2: Finish support for feature splits
  Add support for configForSplit

7 years agoMerge "Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef am: c47f92b374"
Android Build Merger (Role) [Fri, 17 Mar 2017 23:12:00 +0000 (23:12 +0000)]
Merge "Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef am: c47f92b374"

7 years agoMerge "Better call emulation for DevicePolicyManagerTest"
TreeHugger Robot [Fri, 17 Mar 2017 23:11:41 +0000 (23:11 +0000)]
Merge "Better call emulation for DevicePolicyManagerTest"

7 years agoMerge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef
Andreas Gampe [Fri, 17 Mar 2017 23:11:11 +0000 (23:11 +0000)]
Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef
am: c47f92b374

Change-Id: I6038dc9afd05c375bd1c6933b2aa5882f7835174

7 years agoMerge "Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0...
Android Build Merger (Role) [Fri, 17 Mar 2017 23:10:41 +0000 (23:10 +0000)]
Merge "Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0 am: acd3953ea1"

7 years agoMerge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0
Jakub Pawlowski [Fri, 17 Mar 2017 23:09:10 +0000 (23:09 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0
am: acd3953ea1

Change-Id: Ic2c7bd33d558bb4e8cfff063c95f2fa137aeaae0

7 years agoMerge "Fix ArrayMap.get vs ArrayMap.valueAt typo"
TreeHugger Robot [Fri, 17 Mar 2017 23:07:27 +0000 (23:07 +0000)]
Merge "Fix ArrayMap.get vs ArrayMap.valueAt typo"

7 years agoMerge "Show friction icons in Saved Networks list."
TreeHugger Robot [Fri, 17 Mar 2017 23:06:09 +0000 (23:06 +0000)]
Merge "Show friction icons in Saved Networks list."

7 years agoMerge "Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji"
TreeHugger Robot [Fri, 17 Mar 2017 23:04:30 +0000 (23:04 +0000)]
Merge "Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji"

7 years agoMerge "Ota: Add command logging" am: 9a8d78dc86
Andreas Gampe [Fri, 17 Mar 2017 22:53:33 +0000 (22:53 +0000)]
Merge "Ota: Add command logging" am: 9a8d78dc86
am: 8dd991a7ef

Change-Id: I7a5061a98c33abbae787a42079c41263dbcdc7cb

7 years agoMerge "Update fontchain_lint.py to read Emoji 5.0 data"
TreeHugger Robot [Fri, 17 Mar 2017 22:49:17 +0000 (22:49 +0000)]
Merge "Update fontchain_lint.py to read Emoji 5.0 data"

7 years agoMerge "Ota: Add command logging"
Andreas Gampe [Fri, 17 Mar 2017 22:45:34 +0000 (22:45 +0000)]
Merge "Ota: Add command logging"
am: 9a8d78dc86

Change-Id: I48b887a26c8f8123c112559da0f74112bb703b1c

7 years agoMerge "Add new precise call fail causes and OEM causes" am: 9aa841d254 am: 4992b1533e
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254 am: 4992b1533e
am: a7c4fdbf03

Change-Id: Iea9ee9c4a407638dfa19669b25d0c1534978d4a6

7 years agoMerge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f
Jakub Pawlowski [Fri, 17 Mar 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f
am: 07d79aa3b0

Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7

7 years agoMerge "Ota: Add command logging"
Treehugger Robot [Fri, 17 Mar 2017 22:35:47 +0000 (22:35 +0000)]
Merge "Ota: Add command logging"

7 years agoMerge "Bluetooth 5 move timeout parameter (1/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 22:34:24 +0000 (22:34 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
am: d9f2f67a5f

Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543

7 years agoMerge "Add new precise call fail causes and OEM causes" am: 9aa841d254
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:34:01 +0000 (22:34 +0000)]
Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254
am: 4992b1533e

Change-Id: I00c97934ad59e996844831ee23ace60813d3ce0c

7 years agoMerge "Update references to removed APIs"
TreeHugger Robot [Fri, 17 Mar 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Update references to removed APIs"

7 years agoAOD: Use color filter to invert icons for AOD
Adrian Roos [Wed, 8 Mar 2017 23:26:14 +0000 (15:26 -0800)]
AOD: Use color filter to invert icons for AOD

Fixes an issue where the AOD icons where of different
brightness because they were converted to grayscale and
then inverted. Now we just set the appropriate color filter
instead.

Change-Id: Ic359aaee2e19274670f44c5b7380c636ee26e559
Test: Open AOD, observe that the icons are colored solid white (like the clock) instead of gray.
Fixes: 35850204

7 years agoNotificationWrappers: Factor out doze treatment
Adrian Roos [Wed, 8 Mar 2017 22:58:33 +0000 (14:58 -0800)]
NotificationWrappers: Factor out doze treatment

Bug: 35850204
Test: receive a notification group, observe that the group icon is correctly inverted on ambient display.
Change-Id: Id7aba066eb1683705fdc2c008e657bd819ddd31d

7 years agoMerge "Add new precise call fail causes and OEM causes"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:11 +0000 (22:27 +0000)]
Merge "Add new precise call fail causes and OEM causes"
am: 9aa841d254

Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897

7 years agoMerge "Bluetooth 5 move timeout parameter (1/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 22:24:04 +0000 (22:24 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"

7 years agoBluetooth 5 move timeout parameter (1/2)
Jakub Pawlowski [Fri, 17 Mar 2017 18:12:15 +0000 (11:12 -0700)]
Bluetooth 5 move timeout parameter (1/2)

Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.

Test: manual
Bug: 30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde

7 years agoMerge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am...
Peter Qiu [Fri, 17 Mar 2017 22:23:30 +0000 (22:23 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am: 8951172562
am: 79ff52975f

Change-Id: I80cdbc7f0140e6085c06cab8eaba63e1fc455538

7 years agoMerge "Add new precise call fail causes and OEM causes"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add new precise call fail causes and OEM causes"

7 years agoMerge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b
Peter Qiu [Fri, 17 Mar 2017 22:16:22 +0000 (22:16 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b
am: 8951172562

Change-Id: I3799156a83400d9fa1aa07a4afd935bd9c0f683b

7 years agoUpdate Emoji.java to use ICU
Roozbeh Pournader [Fri, 17 Mar 2017 22:08:47 +0000 (15:08 -0700)]
Update Emoji.java to use ICU

Overrides have been added to update the data to Emoji 5.0, since our
version of ICU only supports Emoji 4.0.

Test: CTS tests continue to pass.
Bug: 27365282
Bug: 30874706
Change-Id: I7c791e1e75ea3510b36f258c1e1c7184051d6d3a

7 years agoMerge "hotspot2: implement toString for PasspointConfiguration"
Peter Qiu [Fri, 17 Mar 2017 22:08:21 +0000 (22:08 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
am: 5bd337397b

Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b

7 years agoMerge "Deprecate IMM#showSoftInputUnchecked() part 1"
Yohei Yukawa [Fri, 17 Mar 2017 22:05:16 +0000 (22:05 +0000)]
Merge "Deprecate IMM#showSoftInputUnchecked() part 1"

7 years agoMerge "hotspot2: implement toString for PasspointConfiguration"
Treehugger Robot [Fri, 17 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"

7 years agoremove deprecated SIM_ACTIVATION_REQUEST intent
fionaxu [Fri, 17 Mar 2017 21:35:39 +0000 (14:35 -0700)]
remove deprecated SIM_ACTIVATION_REQUEST intent

This deprecated intent voilates intent naming conventions as defined in CDD.

Bug:35271104
Test: Manual
Change-Id: Ic7f251a6471de31e17960d612e108203983ce32d

7 years agoMerge "Fix libplatformproto includes/export includes"
TreeHugger Robot [Fri, 17 Mar 2017 21:46:08 +0000 (21:46 +0000)]
Merge "Fix libplatformproto includes/export includes"

7 years agoMerge "Make SYNC_PARENT_SOUNDS a @SystemApi"
TreeHugger Robot [Fri, 17 Mar 2017 21:38:47 +0000 (21:38 +0000)]
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"

7 years agoRemove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji
Roozbeh Pournader [Fri, 17 Mar 2017 19:40:20 +0000 (12:40 -0700)]
Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji

These had remained in Emoji.java although they were removed from Unicode
emoji. The data still needs to be updated to Emoji 5.0, but that will be
done in another CL.

Test: not needed
Bug: 28678294
Change-Id: I491c4bba107b960fb1efccbe19630ab274aa6e29

7 years agoUpdate battery settings summary text.
Doris Ling [Fri, 17 Mar 2017 21:37:24 +0000 (14:37 -0700)]
Update battery settings summary text.

Bug: 36375846
Test: builds
Change-Id: I9d0cf831327960d69296de5b025e18c6f1f6a2ae

7 years agoMerge "Code clean up: remove some dead code."
TreeHugger Robot [Fri, 17 Mar 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Code clean up: remove some dead code."

7 years agoGetting ephemeral flag from PackageManager when UidRecord is null
Suprabh Shukla [Thu, 16 Mar 2017 22:37:36 +0000 (15:37 -0700)]
Getting ephemeral flag from PackageManager when UidRecord is null

When a user switches off background running for an app that was already
stopped, UidRecord is null when passed in to
AcitivityManager#doStopUidLocked resulting in an NPE. We need to get
ephemeral state flag from package manager in such cases.

Test: Manual

Bug: 36158380
Change-Id: Id77848c252cc0ff0c803113ac2c7c19aa0dcf254

7 years agoWarn when ActivityManagerService.dumpStackTraces times out
Brian Carlstrom [Tue, 14 Mar 2017 07:58:26 +0000 (00:58 -0700)]
Warn when ActivityManagerService.dumpStackTraces times out

Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug: 35962833
Change-Id: Ia5444e7e23b3fc34f233ce8cc083d44b284a6cdc

7 years agoMerge "Allow the support library to add its own droiddoc options"
Alan Viverette [Fri, 17 Mar 2017 21:01:58 +0000 (21:01 +0000)]
Merge "Allow the support library to add its own droiddoc options"

7 years agoOta: Add command logging
Andreas Gampe [Fri, 17 Mar 2017 20:59:08 +0000 (13:59 -0700)]
Ota: Add command logging

Log the next command.

Bug: 25612095
Test: m
Change-Id: I284a2fb3e329afcb0b03f7162585b0eefe13eb0e

7 years agoMerge "Send broadcast when user restrictions change."
TreeHugger Robot [Fri, 17 Mar 2017 20:48:28 +0000 (20:48 +0000)]
Merge "Send broadcast when user restrictions change."

7 years agoUpdate references to removed APIs
Alan Viverette [Fri, 17 Mar 2017 20:46:20 +0000 (16:46 -0400)]
Update references to removed APIs

Test: make PRODUCT-sdk_google_aw_x86-sdk
Change-Id: I8e13f43520e609808a9825fa3c89f4233076c5a9

7 years agoCorrectly check expired jobs against active ones
Christopher Tate [Wed, 15 Mar 2017 19:01:22 +0000 (12:01 -0700)]
Correctly check expired jobs against active ones

If a job was run before its deadline, and then the deadline landed
while the job was still running, b/c of the 'deadline trumps all'
it would be considered eligible to run again as soon as the previous
iteration completed.

Fix this by checking against the state of the active queue.

Bug 36253320
Test: CTS: job scheduler TimingConstraintsTest

Change-Id: I4f0c1012091bf88776cfe725d7b59f6dcf602c02

7 years agoMerge "Dump native stack for background ANR if process is of interest"
Brian Carlstrom [Fri, 17 Mar 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Dump native stack for background ANR if process is of interest"

7 years agoAverage scan results for AccessPoints.
Sundeep Ghuman [Thu, 16 Mar 2017 02:06:14 +0000 (19:06 -0700)]
Average scan results for AccessPoints.

This reduces jitter in the WifiTracker and is modeled after a prior
broken implementation which attempted to half-life the rssi each time
AccessPoint.update(ScanResult) is called.

Bug: 34774783
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: Iab3f9914af40f2fd56e8ae7b45dcbd62176c8a67

7 years agoMerge "QS: Revert change to when user switcher is shown"
TreeHugger Robot [Fri, 17 Mar 2017 20:22:36 +0000 (20:22 +0000)]
Merge "QS: Revert change to when user switcher is shown"

7 years agoFix libplatformproto includes/export includes
Dan Willemsen [Fri, 17 Mar 2017 20:05:20 +0000 (13:05 -0700)]
Fix libplatformproto includes/export includes

The host versions of these were pointing to the target generated
sources, without having proper dependencies added. But the build system
already handles these adding these to your local and exported include
directories, so just remove them.

Bug: 36365556
Test: m -j libhwui incident_report incident-section-gen
Change-Id: I52024508eabd8d10899c307c950fe045ff66ab25

7 years agoMerge "Fix deadlock between activity manager and settings provider"
Makoto Onuki [Fri, 17 Mar 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix deadlock between activity manager and settings provider"

7 years agoCode clean up: remove some dead code.
Fan Zhang [Fri, 17 Mar 2017 19:55:21 +0000 (12:55 -0700)]
Code clean up: remove some dead code.

Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53

7 years agoMerge "Revert "Changing initial and default focus behavior""
Alan Viverette [Fri, 17 Mar 2017 19:47:09 +0000 (19:47 +0000)]
Merge "Revert "Changing initial and default focus behavior""

7 years agoShow friction icons in Saved Networks list.
Sundeep Ghuman [Wed, 15 Mar 2017 23:03:55 +0000 (16:03 -0700)]
Show friction icons in Saved Networks list.

Bug: b/34802842
Test: $ make SettingsFunctionalTests -j40
$ adb install -r
$ {OUT}/data/app/SettingsFunctionalTests/SettingsFunctionalTests.apk
$ adb shell am instrument -w \
    'android.settings.functional/android.support.test.runner.AndroidJUnitRunner'

Change-Id: I0d6aedad2aabb40ef532283a755cb5c954e8139d

7 years agoFix broken AccessPointTests.
Sundeep Ghuman [Thu, 16 Mar 2017 03:09:47 +0000 (20:09 -0700)]
Fix broken AccessPointTests.

Bug: None
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5d5da5e7e0faf1c124816f0dd8ab5f0249e54637

7 years agoBetter call emulation for DevicePolicyManagerTest
Robin Lee [Fri, 17 Mar 2017 12:50:24 +0000 (12:50 +0000)]
Better call emulation for DevicePolicyManagerTest

Let's have several separate contexts instead of doing strange things
with package names in one monolithic context representing every single
user on the device at once, sometimes multiple times in the same call.

Syntax looks like:

        runAsCaller(callerContext, dpms, (dpm) -> {
            assertSomething(dpm.doSomething(caller, param));
        });

When a caller calls into DevicePolicyManager here's what happens:

PRE

- a new DevicePolicyManager is created with the caller context
- service context callingIdentity is saved
- the callingUid, callingPid, and callingPermissions are added to the service context

TEST

- client-side test code interacts with DevicePolicyManager using the caller context
- server-side coder under test runs as DevicePolicyManagerService using the service context

POST

- service context callingIdentity is restored to what it was before the test.

This should be easier to reason about.

Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases
Change-Id: I148e3f298b0a958639ce261e9cf91f6eb49fae4d

7 years agohotspot2: implement toString for PasspointConfiguration
Peter Qiu [Fri, 17 Mar 2017 16:39:11 +0000 (09:39 -0700)]
hotspot2: implement toString for PasspointConfiguration

Bug: 35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af

7 years agoMerge "Block modifying types of channels"
Conrad Chen [Fri, 17 Mar 2017 19:39:37 +0000 (19:39 +0000)]
Merge "Block modifying types of channels"

7 years agoRevert "Changing initial and default focus behavior"
Evan Rosky [Fri, 17 Mar 2017 19:39:15 +0000 (12:39 -0700)]
Revert "Changing initial and default focus behavior"

This is a soft revert.

This reverts commit 37df2dbab124452e04bf14784df9ab5c2f64e434

Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2

7 years agoMerge "Adding an extras Bundle to MessagingStyle messages."
TreeHugger Robot [Fri, 17 Mar 2017 19:37:57 +0000 (19:37 +0000)]
Merge "Adding an extras Bundle to MessagingStyle messages."

7 years agoMerge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays"
TreeHugger Robot [Fri, 17 Mar 2017 19:19:40 +0000 (19:19 +0000)]
Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays"

7 years agoFix ArrayMap.get vs ArrayMap.valueAt typo
Mårten Kongstad [Fri, 27 Jan 2017 09:15:49 +0000 (10:15 +0100)]
Fix ArrayMap.get vs ArrayMap.valueAt typo

Replace incorrect call to ArrayMap.get with correct call
ArrayMap.valueAt.

This bug was discovered when removing an overlay from /vendor/overlay
and restarting the device. The OMS settings file still referred to the
overlay, and when the settings item was to be removed, the following
crash occurred.

*** FATAL EXCEPTION IN SYSTEM PROCESS: main
java.lang.NullPointerException: Attempt to read from field 'java.lang.String android.content.om.OverlayInfo.packageName' on a null object reference
   at com.android.server.om.OverlayManagerServiceImpl.onSwitchUser(OverlayManagerServiceImpl.java:121)
   at com.android.server.om.OverlayManagerService.onSwitchUser(OverlayManagerService.java:257)
   at com.android.server.om.OverlayManagerService.<init>(OverlayManagerService.java:237)
   at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:580)
   at com.android.server.SystemServer.run(SystemServer.java:363)
   at com.android.server.SystemServer.main(SystemServer.java:238)
   at java.lang.reflect.Method.invoke(Native Method)
   at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygote.java:226)
   at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:726)

Test: adb exec-out stop && adb exec-out rm /vendor/overlay/... && adb exec-out start
Change-Id: I341a8d6eb90555b9169e5cd7dfac87d850b72e9b

7 years agoMake SYNC_PARENT_SOUNDS a @SystemApi
Robin Lee [Thu, 16 Mar 2017 17:19:42 +0000 (17:19 +0000)]
Make SYNC_PARENT_SOUNDS a @SystemApi

Since there is a CTS test depending on it which is currently hardcoding
the string. Let's not do that.

Bug: 30658854
Test: make full -j30
Change-Id: I6f6b1044ac664589b8fe76ced9961e80024b0b29

7 years agoFix deadlock between activity manager and settings provider
Makoto Onuki [Fri, 17 Mar 2017 18:50:13 +0000 (11:50 -0700)]
Fix deadlock between activity manager and settings provider

Test: manual
Bug 36028906

Change-Id: I20344608d79d174b468506056789c04d3bde510f

7 years agoQS: Revert change to when user switcher is shown
Jason Monk [Fri, 17 Mar 2017 18:49:47 +0000 (14:49 -0400)]
QS: Revert change to when user switcher is shown

Its making it inconsistently show up on the lock screen. Until
final behavior is decided, revert to old behavior.

Change-Id: Ifc69f2d5b527cc9ce5a174b16b8b605db26fc35b
Fixes: 36141544
Test: visual

7 years agoMerge "Fix BitmapShader to work with adaptive icons"
Diego Perez [Fri, 17 Mar 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Fix BitmapShader to work with adaptive icons"

7 years agoMerge "Disable large-ish parcel logging."
TreeHugger Robot [Fri, 17 Mar 2017 17:57:26 +0000 (17:57 +0000)]
Merge "Disable large-ish parcel logging."

7 years agoMerge "Removed 'virtual' from autofill method names."
TreeHugger Robot [Fri, 17 Mar 2017 17:54:30 +0000 (17:54 +0000)]
Merge "Removed 'virtual' from autofill method names."

7 years agoMerge "Adding enabled state for remote actions."
TreeHugger Robot [Fri, 17 Mar 2017 17:51:40 +0000 (17:51 +0000)]
Merge "Adding enabled state for remote actions."

7 years agoMerge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 am:...
Roshan Pius [Fri, 17 Mar 2017 17:40:54 +0000 (17:40 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 am: da34226f06
am: 9205ccf3ee

Change-Id: I33a6f328a4373c323bfe1b2de59273faf5c03695

7 years agoMerge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
Roshan Pius [Fri, 17 Mar 2017 17:39:37 +0000 (17:39 +0000)]
Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
am: 28212c1b29

Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09

7 years agoMerge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25
Roshan Pius [Fri, 17 Mar 2017 17:34:10 +0000 (17:34 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25
am: da34226f06

Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6

7 years agoMerge "WifiConfiguration: Update psk documentation" am: 89c79ff632
Roshan Pius [Fri, 17 Mar 2017 17:33:06 +0000 (17:33 +0000)]
Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632
am: 6b6f1b9e12

Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250

7 years agoAllow holders of MANAGE_ACTIVITY_STACKS to launch on private displays
Andrii Kulian [Fri, 17 Mar 2017 17:30:50 +0000 (10:30 -0700)]
Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays

MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.

Bug: 34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0

7 years agoMerge "WifiConfiguration: Correct documentation for priority"
Roshan Pius [Fri, 17 Mar 2017 17:28:13 +0000 (17:28 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da

7 years agoMerge "WifiConfiguration: Update psk documentation"
Roshan Pius [Fri, 17 Mar 2017 17:26:57 +0000 (17:26 +0000)]
Merge "WifiConfiguration: Update psk documentation"
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8

7 years agoMerge "Allow Instant Apps access PackageInfo of exposed apps"
TreeHugger Robot [Fri, 17 Mar 2017 17:26:18 +0000 (17:26 +0000)]
Merge "Allow Instant Apps access PackageInfo of exposed apps"

7 years agoMerge "WifiConfiguration: Correct documentation for priority"
Treehugger Robot [Fri, 17 Mar 2017 17:18:31 +0000 (17:18 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"

7 years agoMerge "WifiConfiguration: Update psk documentation"
Treehugger Robot [Fri, 17 Mar 2017 17:17:50 +0000 (17:17 +0000)]
Merge "WifiConfiguration: Update psk documentation"

7 years agoMerge "Add getProgramList call to the broadcast radio API."
Tomasz Wasilczyk [Fri, 17 Mar 2017 16:34:50 +0000 (16:34 +0000)]
Merge "Add getProgramList call to the broadcast radio API."

7 years agoMerge "Update ColorFilter_Delegate following Change I5f74addd"
Jerome Gaillard [Fri, 17 Mar 2017 16:29:32 +0000 (16:29 +0000)]
Merge "Update ColorFilter_Delegate following Change I5f74addd"

7 years agoDisable large-ish parcel logging.
Jeff Sharkey [Fri, 17 Mar 2017 16:25:07 +0000 (10:25 -0600)]
Disable large-ish parcel logging.

This logging was originally added to track down very large log
messages that were causing Binder transactions to fail.  We fixed
a handful of bugs that could have been causing this over in 32575987,
so this logging should no longer be needed in live builds.  (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)

Test: builds, boots
Bug: 36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da

7 years agoMerge "Fix up QS edit UI"
TreeHugger Robot [Fri, 17 Mar 2017 16:11:32 +0000 (16:11 +0000)]
Merge "Fix up QS edit UI"

7 years agoRemoved 'virtual' from autofill method names.
Felipe Leme [Fri, 17 Mar 2017 00:13:25 +0000 (17:13 -0700)]
Removed 'virtual' from autofill method names.

Fixes: 36126001
Test: VirtualContainerActivityTest pass

Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f

7 years agoMerge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
Neil Fuller [Fri, 17 Mar 2017 15:50:31 +0000 (15:50 +0000)]
Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
am: cef08e7482  -s ours

Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa

7 years agoDump native stack for background ANR if process is of interest
Brian Carlstrom [Sat, 11 Mar 2017 08:14:13 +0000 (00:14 -0800)]
Dump native stack for background ANR if process is of interest

Bug: 30112521
Bug: 36043456
Bug: 35241370
Test: make -j32 -k && flashall
Change-Id: I25b134ec24c534f3cfeb5a7c43195da3a6285d57

7 years agoWifiConfiguration: Correct documentation for priority
Roshan Pius [Thu, 16 Mar 2017 18:07:07 +0000 (11:07 -0700)]
WifiConfiguration: Correct documentation for priority

Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc