Commit Graph

309172 Commits

Author SHA1 Message Date
TreeHugger Robot
d77ae2b0ac Merge "Implement reset to original selection." 2017-02-25 02:57:55 +00:00
Jack Yu
82c46d11f6 resolve merge conflicts of e091985bb5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
2017-02-24 18:47:01 -08:00
TreeHugger Robot
bcf55c19ed Merge "Add CIECAT02 chromatic adaptation transform" 2017-02-25 02:45:55 +00:00
TreeHugger Robot
7548ad9ed0 Merge "Process the NetworkInfo before updating AccessPoints." 2017-02-25 02:31:47 +00:00
Garfield Tan
75379db42d Strip out some logics from ESP to FSP that DSP can use.
Also notify MediaStore when move happens.

Test: build & smoke tested.
Change-Id: I01576765c0b25089a81b77ce0904abea8b24d485
2017-02-24 18:30:03 -08:00
TreeHugger Robot
3b57462a86 Merge "Refactored savableIds() into a SaveInfo class." 2017-02-25 01:45:00 +00:00
Robin Lee
3e7cf168a5 Make IKeyChainAliasCallback oneway
So it can be sent from devicepolicymanager (system_server) to keychain
(a system_app) without waiting on the response and having to do
everything in a background thread.

Side-effect: the regular keychain => app callback is slightly more
efficient now too. in case anyone particularly needs blazing fast
private key user selections.

Fix: 35675253
Test: cts-tradefed run cts --abi=arm64-v8a --skip-device-info --module CtsDevicePolicyManagerTestCases --test 'com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement' </dev/null 2>&1
Change-Id: I6e9d96ca3c42e6489d879d8cfb0507eb94838bf1
2017-02-25 01:32:54 +00:00
Chen Xu
b44860f994 Merge "move ACTION_CARRIER_SETUP intent to public api" am: fcb37ffc60 am: f4854018a2
am: 9897cc4369  -s ours

Change-Id: Ie96a60472c7d7f0fb8e70e535745d849bfc3f68c
2017-02-25 01:24:27 +00:00
TreeHugger Robot
38323b0280 Merge "Add logging constants for setting build number preference." 2017-02-25 01:19:18 +00:00
Chen Xu
9897cc4369 Merge "move ACTION_CARRIER_SETUP intent to public api" am: fcb37ffc60
am: f4854018a2

Change-Id: Ie9ff472da7912042ec969268dd46d1b9a404526c
2017-02-25 01:17:31 +00:00
Makoto Onuki
e9cedbd281 Merge "Don't include Bitmaps in activity intents" 2017-02-25 01:15:35 +00:00
Robin Lee
8b371480d3 Remove tint from network logging icon
Mirrors the change in commit 3250885c9f
("Visual refresh for QS") which removed tint from all ic_qs_xyz.xml
icons for quicksettings.

This one was missed because it was committed to nougat-mr2-dev and
only merged into the development branch afterwards.

Change-Id: I603c31aa82e9d52925fbe06d02a620036d93056e
Fix: 35620542
Test: adb shell am start 'android.app.action.SHOW_DEVICE_MONITORING_DIALOG' on a device with network logging enabled.
2017-02-25 01:15:19 +00:00
Treehugger Robot
e091985bb5 Merge "Added a settings for CMAS message broadcast" 2017-02-25 01:13:29 +00:00
Yifan Hong
9ecbc04c23 IServiceManager/ITokenManager uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: boots
Test: hidl_test

Bug: 33844934
Change-Id: I5774469712d70de4b2629258fe54d7f8c280d9d0
2017-02-24 17:12:53 -08:00
Chen Xu
f4854018a2 Merge "move ACTION_CARRIER_SETUP intent to public api"
am: fcb37ffc60

Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
2017-02-25 01:12:09 +00:00
Chen Xu
fcb37ffc60 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
Amith Yamasani
99ccebf548 Merge "Reduce screen on delay during UsageStats rollover" 2017-02-25 00:59:02 +00:00
Sundeep Ghuman
2b48990b9c Process the NetworkInfo before updating AccessPoints.
This fixes a UI issue where the Tracker first displays the connected
accessPoint as inactive before processing the connected state, which
causes the list to jump around.

Also add useful debugging information to AccessPoint toString.

Bug: 35681450
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I9a8356cfdd2e5be2da58ce5de82e228fddf301f9
2017-02-24 16:57:53 -08:00
TreeHugger Robot
eef52f7322 Merge "Fix VR current component changes being ignored." 2017-02-25 00:56:01 +00:00
Winson Chung
f04c1dd047 Fixing regression when going to fullscreen from PiP.
- Just ensure that we don't resize the stack if it's already not
  visible.

Bug: 35338156
Test: Enter/exit pip on TV
Change-Id: I0bd234dd18ecd3d7d4cb37edad9f1fb3053d96bb
2017-02-24 16:47:37 -08:00
TreeHugger Robot
4351d95225 Merge changes Ib32aca72,I201f081e
* changes:
  Bind to the recommendation service specified in the Setting.
  Move NetworkScorerAppManager into com.android.server.
2017-02-25 00:41:11 +00:00
Sudheer Shanka
12d2922a6e Fix default value for mUidState.get.
In updateRulesForWhitelistedPowerSaveUL, we are using
mUidState.get(uid). So if the uid didn't already exist, it will
give 0 which represents PROCESS_STATE_PERSISTENT and this is
inconsistent with it's other usages.

Bug: 35766310
Test: verified that apps coming to foreground, while the battery saver is on,
      have access to network.
Change-Id: I42a8455862e3a15e14825d9cf74e05a6f1dbe298
2017-02-24 16:38:15 -08:00
Conrad Chen
be339625a8 Merge "Add TvProvider methods to get and add columns" 2017-02-25 00:18:04 +00:00
Jack Yu
a585180c75 Merge "Added a settings for CMAS message broadcast" 2017-02-25 00:11:12 +00:00
Makoto Onuki
8abba3a641 Don't include Bitmaps in activity intents
Bug: 35515740
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases

Change-Id: Ibb94728eb03997bb850b08c61c756f283bd90a08
2017-02-24 15:37:38 -08:00
Jason Monk
af57b3dfb0 Merge "Add colorError" 2017-02-24 23:29:29 +00:00
Zak Cohen
90a8a80a76 Fix VR current component changes being ignored.
Bug: 35723429
Test: built, run on device and verified that controller works
Change-Id: I7467f893ef313145d7aa555285dae60cb7ec3cf2
2017-02-24 15:24:24 -08:00
Mike Reed
82d3b17f6d deprecate replayClips
replayClips is deprecated, just get the rgn instead for setBitmap

Test: ran Canvas CTS
Change-Id: Id0f0da6602d1488bb4071885704fa6e3b449ab85
2017-02-24 18:23:05 -05:00
TreeHugger Robot
3471880ab0 Merge "Improve service docs around user unlocking." 2017-02-24 23:17:44 +00:00
Soonil Nagarkar
3dd51ad2e4 Merge "Throttle GNSS measurements and GNSS navigation messages in background (completely)." 2017-02-24 22:56:49 +00:00
Amith Yamasani
61d5fd7fee Reduce screen on delay during UsageStats rollover
Decoupled the app idle book-keeping from usage stats lock, by
introducing an mAppIdleLock. This is used for all state related
to app idle. In some cases, the locks will be nested, with
mLock being acquired first and then mAppIdleLock.

This should fix the situation where a rollover, which writes to
disk and could take several seconds when the system is swamped,
like when the device just came out of idle and the screen was
turned on (like this run-on sentence), causes calls from other
services for app-idle status to be blocked. This was resulting
in a long time to turn on the screen.

Also fixed a dump indentation issue.

Bug: 34627115
Bug: 34961340
Test: Manual, force into idle, increased rollover frequency,
      and tested screen on time.

Change-Id: Ie8b44e6f07f82d8a31f1b733a403dd9b6dc310f6
2017-02-24 14:54:36 -08:00
TreeHugger Robot
ab78912972 Merge "Send ranking update on channel update." 2017-02-24 22:42:07 +00:00
Fan Zhang
b66e542567 Add logging constants for setting build number preference.
Change-Id: I79ab6c89ec67e464167a96cf4350d8628bacbd91
Fix: 34774945
Test: Builds
2017-02-24 14:37:45 -08:00
TreeHugger Robot
a608207fc3 Merge "gnss HAL uses "default" service name" 2017-02-24 22:21:53 +00:00
Etan Cohen
7c9c4785fc [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
2017-02-24 14:17:51 -08:00
Chris Thornton
d7f52c1b76 Merge "SoundTriggerTestApp: Provide onClick callbacks for audio capture." 2017-02-24 21:56:38 +00:00
Netta Peterbursky
bf07da5650 Merge "Protobufferize PowerManager dumpsys" 2017-02-24 21:36:19 +00:00
Netta Peterbursky
ff506659a7 Merge "Protobufferize PackageManager dumpsys" 2017-02-24 21:35:32 +00:00
Amit Mahajan
f5ee786475 Change internal intents from android.* to com.android.internal.*
Test: none
Bug: 35269293
Change-Id: I74585b3d6459cee613408d80fe4a3c13327e5dab
2017-02-24 13:29:37 -08:00
Robin Lee
1cd368b074 Merge "Thorough javadocumentation for network logging API" 2017-02-24 21:28:17 +00:00
Amit Mahajan
0d105deef8 Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee am: 4b026b656d
am: 2225e56bd3

Change-Id: I3225ab882809159ae1deb97efc0469d8b2777cbe
2017-02-24 20:58:39 +00:00
Amit Mahajan
2225e56bd3 Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee
am: 4b026b656d

Change-Id: I9fca856876619c380529df90fdd86e276666dbb3
2017-02-24 20:53:35 +00:00
TreeHugger Robot
96429a18aa Merge "Change time methods to durations." 2017-02-24 20:49:57 +00:00
Amit Mahajan
4b026b656d Merge "Mark oemhook related APIs @Deprecated."
am: 79faa72eee

Change-Id: Ia31c163fdd65f305095ca1749cbc457eea4b0ca8
2017-02-24 20:48:10 +00:00
Fyodor Kupolov
0ba0d814b3 Don't log privapp-permissions violations for updated apps
Only warn about violations in non-updated apps. If an updated privileged
app started requesting a new privileged permission, it cannot be
whitelisted on system image, so we should revoke it as before, but not log.

Test: manual
Bug: 35633526
Change-Id: I6aacaed4be7bf6eaef08ea81ea49cd250c81e71e
2017-02-24 12:46:37 -08:00
Jeff Sharkey
dd9bda81f6 Delete @removed APIs that never shipped.
These were never part of any public API level, so apps should never
have been using them.

Test: builds, boots
Bug: 31241513
Change-Id: I4fc8f5c325da56694a5db98acc995a22d4947805
2017-02-24 13:41:20 -07:00
Treehugger Robot
79faa72eee Merge "Mark oemhook related APIs @Deprecated." 2017-02-24 20:40:23 +00:00
Josh Gao
c182cde24f Merge "Open /data/anr/traces.txt with O_APPEND." am: 5bf8540194 am: 0b9df3a012
am: ade5ac01f1

Change-Id: I4e12124359c7f98de151951b14cc3de59cf09c1d
2017-02-24 20:37:40 +00:00
Abhijith Shastry
ea6b189486 Permit privileged system apps to send SMS without persisting.
The system app needs to have MODIFY_PHONE_STATE permission.

BUG: 35325136
Test: API visibility change
Change-Id: Ifbe2bfa590ce4acd59bba19610f11a473806b2ef
2017-02-24 12:36:03 -08:00
TreeHugger Robot
145e5c1da9 Merge "Disable task snapshots on svelte" 2017-02-24 20:33:48 +00:00