Commit Graph

74013 Commits

Author SHA1 Message Date
Shigeki Yokomichi
df47bee061 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d am: 4b06345751
am: bce364b776

Change-Id: Ia47be383cbc07818a7a51f85bfba4a30aedd3a5a
2017-02-16 13:23:02 +00:00
Shigeki Yokomichi
bce364b776 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d
am: 4b06345751

Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
2017-02-16 13:14:19 +00:00
Shigeki Yokomichi
4b06345751 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a
am: 657abc315d

Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
2017-02-16 13:06:27 +00:00
Shigeki Yokomichi
657abc315d Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am: e0ba81110a

Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
2017-02-16 12:58:17 +00:00
TreeHugger Robot
cc5b6a4347 Merge "Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED." 2017-02-16 12:54:55 +00:00
Treehugger Robot
e0ba81110a Merge "Fix the "Alarm volume" icon is displayed incorrectly" 2017-02-16 12:47:43 +00:00
TreeHugger Robot
55ab689fac Merge "Auto-grant background execution and data access" 2017-02-16 06:51:08 +00:00
Tomasz Mikolajewski
17c50da4be Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED.
Test: Not testable, as the behavior depends on the quick viewer.
Bug: 32161075
Change-Id: I46ec36fdce481930096f9ae8ee3c54df792b0233
2017-02-16 14:53:57 +09:00
TreeHugger Robot
5653fb10a7 Merge "Introduce Backspace implemenation for flag emoji sequence." 2017-02-16 05:00:49 +00:00
TreeHugger Robot
59d3c40855 Merge "Minor fixes on documentation." 2017-02-16 04:36:56 +00:00
Svet Ganov
da0acdf938 Auto-grant background execution and data access
Companion apps can declare they want background access and
background execution exceptions via dedicated permissions
in their manifest. If such a permission is requested we
auto-grant the corresponding exception after the user has
chosen a device from the companion UI. These permissions
are appop ones allowing us to use the app ops for gauging
whether the user has made a change after we auto-granted
the permission since we would like to revoke these special
privileges when the app disassociates itself from the
companion device if the user did not make an excplicit
choice otherwise.

While at this auto-grant fixed location permission to the
companion device discovery service.

Test: manual

Change-Id: I46ee4291e5e5a8f7613f0dd75eb61d6b9341f306
2017-02-15 20:32:41 -08:00
Aaron Whyte
e0e21d9f19 Merge "Revert "Re-hide AXIS_SCROLL constant."" 2017-02-16 03:41:25 +00:00
Manu Cornet
0c09549ef4 Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am: e0e08f3f41

Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
2017-02-16 03:13:14 +00:00
TreeHugger Robot
634733e42e Merge "Ensuring that there are per-user last stack active times." 2017-02-16 01:53:06 +00:00
Rubin Xu
824b073fbe Merge "Add escrow token API in DevicePolicyManager." 2017-02-16 01:36:46 +00:00
Soonil Nagarkar
760623a499 Merge "Use SystemConfig to control background location throttling whitelist." 2017-02-16 01:33:08 +00:00
Hyunyoung Song
4c64c0d99e Merge "ShortcutManager should support MaskableBitmap Icon type" 2017-02-16 01:04:15 +00:00
Hyunyoung Song
f281e7afae ShortcutManager should support MaskableBitmap Icon type
Note: https://ag/1872683/ is where initial code review happened.

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 --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutHostTestCases -t 'android.content.pm.cts.shortcuthost.ShortcutManagerMultiuserTest'
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t 'com.android.cts.devicepolicy.LauncherAppsProfileTest'


b/34196580

Change-Id: I3b983c29387e474c7a8c687a524105ceaceac81e
2017-02-16 01:01:56 +00:00
Aaron Whyte
22db07f308 Revert "Re-hide AXIS_SCROLL constant."
This reverts commit 8171658b9f.
Bug: 27314061
Bug: 22836852
Bug: 18707397
Change-Id: I6f78962cfa18f11ce5c8caa1d146252bd79f6dbd
2017-02-16 00:59:16 +00:00
Sudheer Shanka
7a627206d4 Merge "Use correct packageName for checking if it belongs to callingUid." 2017-02-16 00:51:49 +00:00
Manu Cornet
512bbdde69 DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
  when switching between users.  With the policy in the phone/stack
  recents, this is fine, but with the grid recents, it no longer only
  applies when out of the historical window, so it is always wrong (it
  would normally be wrong if switching back from another user after the
  historical time of six hours).

  This CL will migrate the last stack active time to a per-user secure
  setting, which will be used going forward.

[This is a manual merge of change 1913535]

Bug: 35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
      return to the original user

Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
2017-02-15 16:37:19 -08:00
TreeHugger Robot
0b6b10d1ee Merge "Fail safely on invalid ScanResults when creating NetworkKey" 2017-02-16 00:27:14 +00:00
Rubin Xu
b9382c23a8 Merge "Add escrow token support to synthetic password flow" 2017-02-15 22:41:54 +00:00
Rubin Xu
5ccd8291ed Merge "Add synthetic password to authentication flow" 2017-02-15 22:37:42 +00:00
Guang Zhu
d80ba8abc8 Merge "Revert "remove app-ephemeral"" 2017-02-15 21:47:34 +00:00
Guang Zhu
626ffb4556 Merge "Revert "Per user setting for instant app"" 2017-02-15 21:47:34 +00:00
Winson Chung
28217a4ca2 Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
  when switching between users.  With the policy in the phone/stack
  recents, this is fine, but with the grid recents, it no longer only
  applies when out of the historical window, so it is always wrong (it
  would normally be wrong if switching back from another user after the
  historical time of six hours).

  This CL will migrate the last stack active time to a per-user secure
  setting, which will be used going forward.

Bug: 35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
      return to the original user

Change-Id: I9941526de5d1dd52d1f9003e795995389064b19d
2017-02-15 13:46:52 -08:00
Guang Zhu
be9ffa15af Revert "Per user setting for instant app"
Bug: 35390781

This reverts commit 2f5811dcfd.

Change-Id: Ibb1c8dacbdc6908fc7fa2bc5dca664f2455162bf
2017-02-15 21:43:48 +00:00
Guang Zhu
c2f0d886f4 Revert "remove app-ephemeral"
Bug: 35390781

This reverts commit 4eb7cea562.

Change-Id: I94567d333b40f99f7a2573125259f4ab575a0519
2017-02-15 21:43:38 +00:00
Soonil Nagarkar
2b565df367 Use SystemConfig to control background location throttling whitelist.
Test: manual

Change-Id: I51285f9a463381855f2bb3fa9af34af1930b8ebd
2017-02-15 13:43:11 -08:00
Philip P. Moltmann
9a044dad00 Merge changes from topic 'revert-anr-revert'
* changes:
  Process queuedWork on main thread and add logging
  Revert accidential merge 492a058d58
2017-02-15 21:37:34 +00:00
Selim Cinek
b52448c8b5 Merge "Fixed a few coloring issues" 2017-02-15 20:08:58 +00:00
Rubin Xu
aab7a4146c Add escrow token API in DevicePolicyManager.
Take advantage of the new authentication flow in LockSettingsService
and allow PO or DO to provision escrow tokens on the device. The
escrow token grants them the ability to change device lockscreen
(if used by DO) or work profile challenge (if used by PO). The
new password reset mechanism is even usable before user unlocks,
and it preserves authentication-bound keys in keystore.

Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Test: runtest frameworks-services -c com.android.server.devicepolicy.DevicePolicyManagerTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testResetPasswordWithToken
Bug: 33126620
Change-Id: Iaa684c51946f726cbd909e9ac70ad3e9ca3de1ac
2017-02-15 19:54:31 +00:00
Rubin Xu
f095f8366b Add escrow token support to synthetic password flow
Escrow token provides an alternative way to derive synthetic password for a
given user. In the new flow, a pre-provisioned escrow token
should be able to do anything the user password can do, since they both
derives the synthetici password which is the master key in the new auth flow.

Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Bug: 33126414
Change-Id: Ib5ee38fd61f66de3245427ce992ebc12f1873a26
2017-02-15 19:54:25 +00:00
Rubin Xu
3bf722a8d5 Add synthetic password to authentication flow
The user password is used to unlock a per-user synthetic password which
serves the purpose of what the user password previsouly achieves (protect
keystore, vold disk encryption, auth token generation).

Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Test: manual
    1. Start with fresh device, enable synthetic password with "adb shell cmd lock_settings sp 1"
        1.1 add device lock, reboot and verify (positive & negative); change device lock, reboot and verify.
        1.2 Inflate a work profile, reboot and verify device lock. check SID with "adb shell dumpsys lock_settings"
        1.3 Un-unify and add work challenge, reboot and verify work challenge and SID.
        1.4 Re-unify work challenge, reboot and verify.
        1.5 Clear device lock, reboot and verify lock and SID.

    2. Start with a fresh device, add a device lock and inflate a work profile.
        2.1 Enable synthetic password, note current SID
        2.2 Reboot and unlock device. Verify synthetic password is generated and SID remains.
        2.3 Clear device lock, reboot and verify (SID should be cleared)

    3. Start with a fresh device, inflate a work profile, add separate work challenge
        3.1 Enable synthetic password, not current SID
        3.2 Reboot and unlock device and profile. Verify synthetic password is generated.
        3.3 Clear device lock only, reboot and verify (work profile SID should remain)

    All steps tested on marlin (FBE) and bullhead (FDE)

Bug: 33126414
Change-Id: Idb9ebfc7bba2fe40670c5fee2189e873d9704540
2017-02-15 19:48:33 +00:00
Todd Kennedy
93a8e2c7d1 Merge "remove app-ephemeral" 2017-02-15 19:48:22 +00:00
Philip P. Moltmann
a211bc1a03 Process queuedWork on main thread and add logging
- The queued work processing thread might be sleeping while the main
  thread is waiting for it to do work. Hence process the work in the main
  thread.
- Carefully add logging so that slowness can be tracked.
- Fix usage of the wrong lock (sWork instead of sLock).
- Increase the time of the delay between apply and write to make
  possible side-effects more visible

Test: SharedPrefencesTest, looked at logging
Bug: 30662828
Change-Id: Ie8a5d531e180dacec29c947ba0b59b170facf782
2017-02-15 11:27:27 -08:00
Todd Kennedy
bf92b812db Merge "Per user setting for instant app" 2017-02-15 19:19:26 +00:00
Felipe Leme
f23e652c40 Minor fixes on documentation.
Bug: 31001899
Test: m update-api
Change-Id: I1f08552885fb5572ca9d811959dfe2b965ce3537
2017-02-15 09:06:24 -08:00
Todd Kennedy
4eb7cea562 remove app-ephemeral
instant apps are no longer stored in a separate folder. they
are now stored along side other full apps in the apps directory.

Bug: 25119046
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: I6669be797987169a0b9cca78f80539c908812f9e
2017-02-15 07:06:02 -08:00
Narayan Kamath
4211358c74 Merge "Zygote: Add support for explicit preloading of resources." 2017-02-15 14:43:22 +00:00
Andrei Stingaceanu
302fe9098b Merge "TextView/LinkMovementMethod/ClickableSpan - touch up revert" 2017-02-15 14:28:55 +00:00
Esteban Talavera
c3dfa81973 Merge "Revert "Use context's userId in ContentResolver class."" 2017-02-15 13:35:35 +00:00
Esteban Talavera
da2006a0bd Revert "Use context's userId in ContentResolver class."
This reverts commit 2b44387f5d.

Bug: 35374151
Change-Id: Ifdde7a3b4e9141d7e283478aff49971c6a5dcaa2
2017-02-15 13:20:24 +00:00
Narayan Kamath
669afcc9d0 Zygote: Add support for explicit preloading of resources.
Add a --preload-default command that instructs the zygote to preload
resources. The command is a no-op if resources have already been
preloaded.

Test: manual.
Change-Id: I4a846a7d911fa929af472d9071ffbff6df424176
2017-02-15 10:25:48 +00:00
Narayan Kamath
83e0faf2cc Merge "Zygote: Reset niceness if lazy preloading is enabled." 2017-02-15 10:15:16 +00:00
Sergio Sancho
b662231125 Merge "Ensure we set the notification marker position by calling updateMarker() just after the AudioTrack is initialized. This solve the issue with cached synthesis in which updateMarker was called before AudioTracker initialization and we never got the callbacks." 2017-02-15 09:31:29 +00:00
Felipe Leme
a45eb7eb12 Merge "Enable auto-fill when activity is marked as FLAG_SECURE." 2017-02-15 07:48:48 +00:00
Stephen Chen
fde900dbbd Fail safely on invalid ScanResults when creating NetworkKey
Added tests for NetworkKey#createFromScanResult

Bug: 34671341
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkKeyTest.java
runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

Change-Id: Ideac1615917649cd3934421228a82aeed37e7ad1
2017-02-14 18:39:57 -08:00
Sudheer Shanka
f88ebeb250 Use correct packageName for checking if it belongs to callingUid.
In AccountManagerService.getAccountsAsUser, we check if opPackageName
belongs to calling uid by calling AppOpsManager.checkPackage. But when
AccountManagerService.getAccountsAsUser is called from
AccountManagerService.addSharedAccountsFromParentUser, we're using the
opPackageName from system context instead of calling context.

Bug: 35258008
Test: cts-tradefed run singleCommand cts-dev --module CtsMultiUserHostTestCases \
      -t android.host.multiuser.CreateUsersPermissionTest#testCanCreateRestrictedUser
Change-Id: I5c425d9314beb86f7c64a5b5c64b7d879711879a
2017-02-14 18:35:05 -08:00