drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468,188 Commits 1 Branch 0 Tags
Commit Graph

468188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
940f172ecf [automerger skipped] Merge "Stop exposing generated AIDL from Tethering" am: ccf2c88a18 am: fdbd820293 am: 4cfcbfa7ec -s ours 
am skip reason: Change-Id Ia4222fa35a9a2f3c75cebb12f75c536f27e2fe16 with SHA-1 c38998bc5b is in history

Change-Id: I51ef292d3a4d28c62bbe8156b907183a0b56208b
 2020-02-20 12:56:40 +00:00
Automerger Merge Worker
a74588fd6e Merge "Remove unused filegroup" am: 3ff1caf424 am: 281f4e4ef9 am: f4255ac0d6 
Change-Id: I67ad167574d85124ee5595b321a522be81cb8dcf
 2020-02-20 12:56:18 +00:00
Wale Ogunwale
8536281ef5 Merge changes from topic "single-task" 
* changes:
  Clean-up Bounds Animator code path (92/n)
  Reuse stack as task for single task stacks (90/n)
 2020-02-20 12:50:26 +00:00
Riddle Hsu
8062893261 Merge "Fix seamless condition of fixed rotation transform" 2020-02-20 12:48:37 +00:00
Automerger Merge Worker
4cfcbfa7ec Merge "Stop exposing generated AIDL from Tethering" am: ccf2c88a18 am: fdbd820293 
Change-Id: Id2ae2730ea1a3177729def2b967c8868e330fca4
 2020-02-20 12:44:48 +00:00
Automerger Merge Worker
f4255ac0d6 Merge "Remove unused filegroup" am: 3ff1caf424 am: 281f4e4ef9 
Change-Id: Ia180d02e709276b9db1463204e597de14baf2f25
 2020-02-20 12:44:34 +00:00
Song Hu
78b3cd5775 Merge "Implement sharesheet ranking in PeopleService. Ranking is only based on recency of past sharing for the moment." 2020-02-20 12:41:41 +00:00
Automerger Merge Worker
fdbd820293 Merge "Stop exposing generated AIDL from Tethering" am: ccf2c88a18 
Change-Id: I5490acfc53c9ae68bb21069c7f04e46d023f308f
 2020-02-20 12:32:28 +00:00
Automerger Merge Worker
281f4e4ef9 Merge "Remove unused filegroup" am: 3ff1caf424 
Change-Id: Ie0087c31f65353272b6a6693d8361f9056bb5c16
 2020-02-20 12:32:01 +00:00
Charles Chen
c56ce6fd08 Merge "Exempt-From-Owner-Approval: Report non-visual Context misuse" 2020-02-20 12:30:06 +00:00
Automerger Merge Worker
4ecadfa0ad [automerger skipped] Merge "Remove obsolete subdirs and optional_subdirs" am: 2b5484564a am: 6467a114fc am: c66f7e8a86 -s ours 
am skip reason: Change-Id Ifcf47e99d22b1546780968d1030f835173612a27 with SHA-1 305fb2fc1a is in history

Change-Id: Idae5c032124228811364239240264898594e66bd
 2020-02-20 12:20:49 +00:00
Anton Hansson
ccf2c88a18 Merge "Stop exposing generated AIDL from Tethering" 2020-02-20 12:18:34 +00:00
Anton Hansson
3ff1caf424 Merge "Remove unused filegroup" 2020-02-20 12:14:36 +00:00
Santiago Seifert
e1fdd601f3 Merge "Deprecate DrmInitData.get(UUID)" 2020-02-20 12:12:06 +00:00
Santiago Seifert
42c3d4bcfa Deprecate DrmInitData.get(UUID) 
And point users to use getSchemeInitDataCount and
getSchemeInitDataAt instead.

Bug: 132153067
Test: No behavioral change.
Change-Id: Ie50067ebdc408481fc69167deab4ebfd376b3543
 2020-02-20 12:11:32 +00:00
Automerger Merge Worker
c66f7e8a86 Merge "Remove obsolete subdirs and optional_subdirs" am: 2b5484564a am: 6467a114fc 
Change-Id: I87d78a7f822278a164b696c5722a270cc8c70272
 2020-02-20 12:04:52 +00:00
Al Sutton
0534f289df Merge "Add debug logging when keys are blocked" 2020-02-20 12:01:44 +00:00
Automerger Merge Worker
6467a114fc Merge "Remove obsolete subdirs and optional_subdirs" am: 2b5484564a 
Change-Id: If5b2437f188c641456feea642d456b7af7013044
 2020-02-20 11:50:58 +00:00
Alex Kershaw
f0f598a711 Merge "Enforce the cross-profile intent check." 2020-02-20 11:40:54 +00:00
Anton Hansson
2b5484564a Merge "Remove obsolete subdirs and optional_subdirs" 2020-02-20 11:38:17 +00:00
Anton Hansson
1254f6740a Merge "Remove obsolete subdirs and optional_subdirs" 2020-02-20 11:35:42 +00:00
Automerger Merge Worker
43e1b98d7d Merge "add default cpu.active power consumption" am: c13747693f am: d3859f38b0 am: df5f8637b6 
Change-Id: I51a423100c9c657d8e1c323fdc7578080dcbce5d
 2020-02-20 11:32:16 +00:00
Automerger Merge Worker
df5f8637b6 Merge "add default cpu.active power consumption" am: c13747693f am: d3859f38b0 
Change-Id: Iedce34a5f0b0dfa3b1959b580aed345e65c1dfd5
 2020-02-20 11:21:49 +00:00
Automerger Merge Worker
214e7a5f62 Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" am: 74952231df am: 310c1b76ea am: 15bcefd386 
Change-Id: I2029bc94536f3617da34bfc4ac18489819baa14a
 2020-02-20 11:14:20 +00:00
TreeHugger Robot
f01c606040 Merge "Add MediaRouter2.RoutingController#getOriginalId() as @TestApi" 2020-02-20 11:13:29 +00:00
Automerger Merge Worker
d3859f38b0 Merge "add default cpu.active power consumption" am: c13747693f 
Change-Id: I6a6e1a1bdf12c9fb521a69b93af3b213ebe1e495
 2020-02-20 11:09:25 +00:00
Santiago Seifert
946a892a79 Merge "Consolidate API naming to use Parser everywhere" 2020-02-20 10:59:19 +00:00
Automerger Merge Worker
15bcefd386 Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" am: 74952231df am: 310c1b76ea 
Change-Id: I1094043068575b6b2a77852d12ac341265aaf6df
 2020-02-20 10:59:18 +00:00
JW Wang
ddf44f4d9b Merge changes I3f7c88ee,Ia5d85d3c,I34d26ddc,I0a64e2dc 
* changes:
  Remove unused code (4/n)
  Pass "-g --user all" when installing apps (3/n)
  No need to switch users before running tests (2/n)
  Wait for rollback becomes available (1/n)
 2020-02-20 10:55:45 +00:00
Treehugger Robot
c13747693f Merge "add default cpu.active power consumption" 2020-02-20 10:53:43 +00:00
JW Wang
14168f321a Remove unused code (4/n) 
Bug: 149876119
Test: m
Change-Id: I3f7c88eeb74ce5b44646fcb7a690665b78a17f2d
 2020-02-20 18:52:21 +08:00
JW Wang
67eb86bb4c Pass "-g --user all" when installing apps (3/n) 
'-g' to grant permissions automatically without checking the API level.
This works around the issue of b/149733368#comment2.

'--user all' to install the app on all users. This is more efficient
than calling #installPackageAsUser one by one on each user.

Bug: 149876119
Test: atest MultiUserRollbackTest
Change-Id: Ia5d85d3c13925ae969ffab9319360c1fefe1f950
 2020-02-20 18:52:18 +08:00
JW Wang
f2a75879d3 No need to switch users before running tests (2/n) 
My local test shows that switch-user doesn't work on my physical device.
In fact there are APIs to run tests against a particular user without
switching. It also speeds up tests without switching users from time to
time.

Bug: 149876119
Test: atest MultiUserRollbackTest
Change-Id: I34d26ddcb6a6e9cdc39228310830a3cd83212e4a
 2020-02-20 18:49:59 +08:00
Automerger Merge Worker
310c1b76ea Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" am: 74952231df 
Change-Id: Id1bf2fa710c24ba76efbc5ad9b83dab63b8c334a
 2020-02-20 10:47:24 +00:00
Anton Hansson
0a0a097d38 Merge "Stop exposing generated AIDL from Tethering" 2020-02-20 10:41:29 +00:00
Anton Hansson
7d0b293053 Merge "Remove wifi aidl-exports from framework-aidl-export-defaults" 2020-02-20 10:41:17 +00:00
Anton Hansson
6a2973a075 Merge "Allow com.android.* classes in system_service stubs" 2020-02-20 10:41:03 +00:00
Treehugger Robot
74952231df Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" 2020-02-20 10:36:46 +00:00
TreeHugger Robot
d98f4e4b05 Merge "Have volume UI dismiss on home button press." 2020-02-20 10:27:47 +00:00
Alan Stokes
5edd765c9d Merge "Add ChangeId for app data isolation." 2020-02-20 10:10:34 +00:00
TreeHugger Robot
1ef019d3e0 Merge "Disable Settings toggle if admin has set always-on VPN" 2020-02-20 10:09:34 +00:00
Alan Stokes
2371ab7838 Merge "Don't kill a new process for the sins of an old process." 2020-02-20 09:36:35 +00:00
TreeHugger Robot
64996c3ded Merge "Add CutoutSpecificationTest in Presubmit Test scope" 2020-02-20 09:18:40 +00:00
TreeHugger Robot
20afdde053 Merge "Add kernel per-uid cpu time reader tests to presubmit" 2020-02-20 09:07:44 +00:00
Automerger Merge Worker
544626a866 Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e am: bcafeae6de am: e82a74f15a 
Change-Id: I614e92207c5406eb21105088a58dcf9230a13b56
 2020-02-20 09:01:56 +00:00
Al Sutton
d5db369554 Add debug logging when keys are blocked 
Adding a log statement at debug level so when the key blocking system
is tested end-to-end there's an easy indicator of a key being blocked.

Bug: 149548272
Test: No code which affects functionality to test
Change-Id: I9de8a7d47ffb75520d1adcba620ec13345c1c4ae
 2020-02-20 08:53:56 +00:00
Automerger Merge Worker
e82a74f15a Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e am: bcafeae6de 
Change-Id: Iede4797f654340b49d1d07bf092b11aa7b7ad1ce
 2020-02-20 08:46:42 +00:00
Shawn Lin
c78f23a129 Merge "Fixed DisplayPolicyLayoutTests fails" 2020-02-20 08:30:10 +00:00
Automerger Merge Worker
bcafeae6de Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e 
Change-Id: I24bc2dd13967c611c34e8d2b287ba991f8c838d4
 2020-02-20 08:28:33 +00:00
JW Wang
eb908a9ee1 Wait for rollback becomes available (1/n) 
Sometimes RollbackManager is slow in making rollbacks available.
Let's give it enough time to do the job and make test less flaky.

Bug: 149876119
Test: atest MultiUserRollbackTest

Change-Id: I0a64e2dcde1f5e6dae618cacd6546ad953c1aca7
 2020-02-20 16:25:10 +08:00