Commit Graph

83622 Commits

Author SHA1 Message Date
TreeHugger Robot
8c3c19dbd3 Merge "Canonicalize notification channel sounds for backup" 2017-10-05 21:06:02 +00:00
TreeHugger Robot
d5ad2ff575 Merge "Clarify that getLocalState is always valid for DragEvent" 2017-10-05 19:03:54 +00:00
Bernardo Rufino
c27bb6ad34 Canonicalize notification channel sounds for backup
Canonicalize for backup and canonicalize and uncanonicalize for restore
(see comment).

Test: Set custom notification sound, make backup, remove notification
sound from device (from Ringtones and make sure to update media content
provider), restore => Observe default instead of random number. Do the
same without removing the sound and observe restores successfully.
Test: runtest systemui-notification
Bug: 66444697
Change-Id: Id2f4685b7f64a35e397eb6dff5246802d795d996
2017-10-05 19:57:31 +01:00
TreeHugger Robot
625a64c243 Merge "First version of Slice data APIs (hidden for now)" 2017-10-05 18:36:45 +00:00
TreeHugger Robot
e0fa2c0408 Merge changes I616184fa,Ibc1500f5
* changes:
  Move mPermissions from package settings
  Move DefaultPermissionGrantPolicy
2017-10-05 18:30:33 +00:00
TreeHugger Robot
6f2118d763 Merge "[WebView] Only pass one path to relro creation/loading at a time." 2017-10-05 17:07:44 +00:00
Jason Monk
d9edfa94b0 First version of Slice data APIs (hidden for now)
Doesn't handle the viewing side, that will come separately.

Test: CTS once unhidden
Change-Id: I78f167bd72fe0be1e0577f8f969a7ffcbcbab666
2017-10-05 12:47:21 -04:00
Gustav Sennton
ae498f2702 [WebView] Only pass one path to relro creation/loading at a time.
There's no need to send both 32-bit and 64-bit paths to the native side
of the relro-creation/loading logic, we can check which one to send on
the java side instead.

Bug: 28736099
Test: Load WebView app, ensure relro file is loaded into the app
process.

Change-Id: Ia3fb4b3ed686c3e70c26a384aae966bda179d225
2017-10-05 15:49:10 +01:00
Todd Kennedy
0eb9738d17 Move mPermissions from package settings
Create a settings class only for use with permissions. It's
subservient [and should only be accessed directly by] package
settings or the permission manager. The rest of the permission
related data needs to be moved to permission settings. At
which point we can start pulling the permission methods out of
the package manager service and into the permission manager.

We still have a somewhat tight relationship between package
manager and the permission manager. It's unclear how far we need
to separate them and if relying entirely on an internal
interface is sufficient.

Bug: 63539144
Test: Manual. Builds and runs
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PermissionsHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermissionTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Test: bit FrameworksServicesTests:com.android.server.pm.PackageManagerSettingsTests
Change-Id: I616184fa2135a11687e4ce615884f861466fdebe
2017-10-05 07:18:10 -07:00
Charles He
aff38adc43 Merge "StatusBar: add DISABLE2_NOTIFICATION_SHADE flag." 2017-10-05 07:52:47 +00:00
Ruben Brunk
5a8466172a Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev am: c765c2c448
am: 3de064f7cc

Change-Id: I97be49896650231b057285ab13672324a8415f11
2017-10-05 04:15:15 +00:00
Ruben Brunk
3de064f7cc Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am: c765c2c448

Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
2017-10-05 04:03:03 +00:00
TreeHugger Robot
c765c2c448 Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev 2017-10-05 03:53:44 +00:00
TreeHugger Robot
678f0b1205 Merge "New autofill API: let service explicitly set dataset filter." 2017-10-05 02:20:48 +00:00
nharold
3aa4caab60 Merge "Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00 am: cc51ef0a47" into oc-mr1-dev-plus-aosp
am: 7261ade5eb

Change-Id: I0624d4df68ba2bd6522da7e3ae14f13b7f2bfbc9
2017-10-05 01:53:29 +00:00
nharold
95d36dd165 Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00
am: cc51ef0a47

Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc
2017-10-05 01:07:53 +00:00
nharold
cc51ef0a47 Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d
am: 0bdb9a6e00

Change-Id: Iac3aa05b4de68b818fe840c2ade4aa600fe29622
2017-10-05 00:55:38 +00:00
nharold
0bdb9a6e00 Merge "Cosmetic Cleanups for IpSecService"
am: 5ade9a228d

Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8
2017-10-05 00:44:37 +00:00
Evan Rosky
22113f0423 Merge "Enable new initial-focus behavior for P" 2017-10-05 00:29:16 +00:00
Felipe Leme
27a026ac1a New autofill API: let service explicitly set dataset filter.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#filterTextUsingRegex
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testDatasetAuthFilteringUsingRegex
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.DatasetTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Fixes: 67314013

Change-Id: I4412c1bf650219d005b9287033b463de6aee764d
2017-10-04 16:56:58 -07:00
TreeHugger Robot
5467373b89 Merge "Fixing typos in ProtoOutputStream doccomment." 2017-10-04 23:24:43 +00:00
Felipe Leme
e541b65c03 Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev am: 6d17d9d0cf
am: 63b45a87d5

Change-Id: Ib7ae51cf0336c4cea8ff90d60995816d43b3fa36
2017-10-04 22:42:29 +00:00
Felipe Leme
63b45a87d5 Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
am: 6d17d9d0cf

Change-Id: I4b1d2a4e308a91d15282ae99ee158b7004b91211
2017-10-04 22:25:18 +00:00
Yi Jin
9a37e8e886 Merge "Remove number of Wake Kills, it is safe to change proto numbers since nothing is being used now." 2017-10-04 22:20:48 +00:00
TreeHugger Robot
6d17d9d0cf Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev 2017-10-04 22:17:11 +00:00
Kweku Adams
b72032a438 Fixing typos in ProtoOutputStream doccomment.
Updating comments to reference non-deprecated methods.

Test: none
Change-Id: I76194d7426e9a828eff629c6a680c064606babf0
2017-10-04 21:50:06 +00:00
Tor Norbye
09a25db6f5 Merge "67002586: Create @NavigationRes + Lint check" 2017-10-04 21:37:02 +00:00
nharold
19d69c61fa Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f am: ae61e0c6e8 am: 4e793fd0b5
am: b87c060ec7

Change-Id: I7418f23141b26f23555397d231e8a73692c04085
2017-10-04 21:14:17 +00:00
nharold
b87c060ec7 Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f am: ae61e0c6e8
am: 4e793fd0b5

Change-Id: Ib7eae5c9e223493281524e862979e16d25984dde
2017-10-04 20:53:04 +00:00
Felipe Leme
8369c689d3 Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev am: 94e07022c2
am: d03db3c7f9

Change-Id: I29dee744197d18cf5085b8b7c23d2cdd29c1dc78
2017-10-04 20:48:29 +00:00
nharold
4e793fd0b5 Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f
am: ae61e0c6e8

Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd
2017-10-04 20:35:20 +00:00
Felipe Leme
d03db3c7f9 Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
am: 94e07022c2

Change-Id: Iccafb0ef26a19788e6bd1d46fb856eb66d8e6087
2017-10-04 20:25:42 +00:00
nharold
ae61e0c6e8 Merge changes from topic "ipsec-svc-cleanup"
am: 9778c7884f

Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
2017-10-04 20:24:10 +00:00
Fan Zhang
141bd92987 Merge "Add helper method to override flag" 2017-10-04 20:11:44 +00:00
Charles He
2eda242fbc StatusBar: add DISABLE2_NOTIFICATION_SHADE flag.
Previously, DISABLE_EXPAND would disable the expansion of the status
bar. But this was only limited to the unlocked case. The status bar (and
thus the quick settings panel) could still be expanded on the lock
screen (keyguard), by swiping down from either the status bar or the
notification cards.

We introduce a new flag which would disable notification shade on all
surfaces, which will be used by DevicePolicyManager to enforce LockTask
restrictions, etc.

Bug: 65813398
Test: runtest systemui
Test: manual, by using a modified version of TestDPC and
      DevicePolicyManager

Change-Id: I364567422e0ca8837ecffa3037adc131c3cef691
2017-10-04 21:11:02 +01:00
Nathan Harold
d6f50b260d Cosmetic Cleanups for IpSecService
This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21
2017-10-04 13:04:55 -07:00
TreeHugger Robot
94e07022c2 Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev 2017-10-04 20:02:19 +00:00
nharold
9778c7884f Merge changes from topic "ipsec-svc-cleanup"
* changes:
  Split IpSecServiceTest to add IPv6 Tests
  Add equals() for IpSecAlgorithm and IpSecConfig
  Input Validation for IpSecService
2017-10-04 20:00:52 +00:00
Felipe Leme
bb567ae6c0 Sets AutofillClient on attachBaseContext()
When an activity overrides attachBaseContext(), the attached context must share
the same AutofillCient, otherwise it will break autofill in the activity.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.AttachedContextActivityTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 67350639

Change-Id: I6b0c4c2fab5fa68eb6ee0714e107ca0816efb2cb
2017-10-04 12:23:23 -07:00
TreeHugger Robot
4a80ff845a Merge "Fix NPE in WebView relro creator process." 2017-10-04 18:45:41 +00:00
Android Build Merger (Role)
d20b3252c6 Merge "Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2 am: 8057ba832e am: 5dfce858ea am: 1b41112e38" 2017-10-04 18:44:46 +00:00
Yueming Wang
01894fb029 Merge "Add a new WipeData API that allows an input string for the reason to wipe user." 2017-10-04 18:37:21 +00:00
Jack He
25feefa918 Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2 am: 8057ba832e am: 5dfce858ea
am: 1b41112e38

Change-Id: I05a04fede6b724a5bffb34a062468e1158870132
2017-10-04 18:36:48 +00:00
Jack He
1b41112e38 Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2 am: 8057ba832e
am: 5dfce858ea

Change-Id: Ia3112971eb20c04325dd04bc76078195cec99a5f
2017-10-04 18:09:50 +00:00
Jack He
5dfce858ea Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2
am: 8057ba832e

Change-Id: I946cce466bb5e048ad7b19cd97caa466dab27a52
2017-10-04 17:42:26 +00:00
Jack He
8057ba832e Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am: cfe51aabd2

Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6
2017-10-04 17:22:28 +00:00
Torne (Richard Coles)
29675b2941 Fix NPE in WebView relro creator process.
There's no context available in the relro creator process, resulting in
a NPE and crash when it tries to see if WebView is supported. Skip the
check in this case, because we know it's supported if we ran the relro
creation process at all.

Change-Id: I95e9aad7407b8f73dddf8a8b685d41d2f500736a
Fixes: 67398770
Test: boot, make sure no crash dialog from "android"
2017-10-04 12:40:55 -04:00
Jack He
37ab815c96 PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
  change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
  states for PBAP profile

Bug: 63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2
2017-10-04 16:22:57 +00:00
TreeHugger Robot
01a89656ba Merge "[Magnifier - 2] Turn magnifier ON" 2017-10-04 13:41:13 +00:00
Clara Bayarri
29e6f56950 Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
am: 889c0c0f12

Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3
2017-10-04 13:00:52 +00:00