Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468,813 Commits 3 Branches 0 Tags
abe2fed8b04c625ea762165ca7e8a0e37c91fefa
Commit Graph

468813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c264e21e53 Merge "Epsilon comparison in RefreshRateRange constructor." 2020-02-20 14:04:03 +00:00
Fabian Kozynski
d3b621aa56 Merge "Add API for requesting add controls from Provider" 2020-02-20 14:00:48 +00:00
Marin Shalamanov
636b1713c7 Small cleanup in DeviceProductInfo. 
This CL fixes a var name and puts "final" in the corrent order.

Test: m
Change-Id: Id7ec3ac1c6f63d03cabe0d878e84a9ed24386d33
 2020-02-20 14:52:07 +01:00
Automerger Merge Worker
1db5e3a0cf Merge "Log UserspaceRebootReported atom from system_server" am: 9b6f6674eb 
Change-Id: I0447ef6d9d52ceaea3645de9db8598a14737b467
 2020-02-20 13:49:49 +00:00
Leon Scroggins III
3d334d816a Make Bitmap::createFrom() account for zero stride 
Bug: 143470518
Test: android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware

Follow up to ag/10045682, which was resolving a merge conflict. The
original fix (https://android-review.googlesource.com/1203783) was
on the single Bitmap constructor which took a GraphicBuffer parameter.
The conflict was with ag/9130111, which switched the input to an
AHardwareBuffer and split this version of Bitmap::createFrom into two
methods. The constructor no longer has access to the information
regarding the buffer stride, so that got moved into Bitmap::createFrom.
But both versions should have the fix. (In fact, it appears that the
version that did *not* have the fix is the one being called in
testConserveMemoryPlusHardware.)

Move the rowBytes computation into a common method so that both will
have the fix.

Change-Id: I16f77528abdb331af556bbe5d0485fe342f2325e
 2020-02-20 13:41:17 +00:00
Nikita Ioffe
9b6f6674eb Merge "Log UserspaceRebootReported atom from system_server" 2020-02-20 13:38:27 +00:00
Ioannis Ilkos
606bf6e066 Add tracepoint for stats pulling 
Test: manual testing pulling atoms
Change-Id: I2e4902f7a71256f83c26bee78fda2df744bb73dd
 2020-02-20 13:31:41 +00:00
Valentin Iftime
4bf82c8206 Address API council suggestions for UserManager APIs 
Test: atest UserManagerTest
Bug: 149742406
Change-Id: I8b408a17de0282b91fcb5c0b66e9d0404fda54b1
 2020-02-20 14:29:43 +01:00
Automerger Merge Worker
b96b334d43 Merge "Stop exposing constructor of TetheringConstants" am: 5dd58dac7e am: f2472fa7aa am: 051bd7f721 
Change-Id: If4cf11820b0d712584e7ee393c26c7c359d7952f
 2020-02-20 13:27:19 +00:00
Automerger Merge Worker
f55ebfd287 [automerger skipped] Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f06 am: 2a29a6056c am: 9044a82935 -s ours 
am skip reason: Change-Id I8b36cf7a4ff569d0b960455de09ed40592dd5a9e with SHA-1 f74130f525 is in history

Change-Id: I41dc29843925112da3b6d405975db6cfde6a36f3
 2020-02-20 13:26:47 +00:00
Stanislav Zholnin
3bce92e5e2 Merge "Add puller for RuntimeAppOpAccess atom." 2020-02-20 13:15:08 +00:00
Automerger Merge Worker
051bd7f721 Merge "Stop exposing constructor of TetheringConstants" am: 5dd58dac7e am: f2472fa7aa 
Change-Id: Ib1f70ab634af2e1a8f3e5c1332f6e5f656fd6275
 2020-02-20 13:10:10 +00:00
Automerger Merge Worker
9044a82935 Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f06 am: 2a29a6056c 
Change-Id: Ie02f54b2b5125f50ce74fb645f3e0c6958d21c32
 2020-02-20 13:09:51 +00:00
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
f2472fa7aa Merge "Stop exposing constructor of TetheringConstants" am: 5dd58dac7e 
Change-Id: Iac2677ca21a0dfcbb3afa40a32d824977e3aaa7e
 2020-02-20 12:56:32 +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
Automerger Merge Worker
2a29a6056c Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f06 
Change-Id: I16055be25b2b5716ffa6c1a6cce17c923288c7c7
 2020-02-20 12:56:15 +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
Mark Chien
5dd58dac7e Merge "Stop exposing constructor of TetheringConstants" 2020-02-20 12:46:19 +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
Anton Hansson
c26b2e8f06 Merge "Allow com.android.* classes in system_service stubs" 2020-02-20 12:36:47 +00:00
Kyunglyul Hyun
8828c891e0 MediaRouter: Define route type 
Change deviceType to type and define more types.
TYPE_GROUP is also added to classify static group routes.

Device type for the default route is set from now

Bug: 149677159
Test: cts test and atest mediaroutertest
Change-Id: I0626efe7b6160f22fe69a0b75368ee1a67d8768c
 2020-02-20 21:32:54 +09: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
ac119a33c2 Allow com.android.* classes in system_service stubs 
The android.* rule is meant to be for the public SDK.

Bug: 147559833
Test: m checkapi
Change-Id: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
Merged-In: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
(cherry picked from commit f74130f525)
 2020-02-20 11:40:34 +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
Kyunglyul Hyun
f55befbfbe MediaRouter2: Fix test bug 
Two set of preferred features could be the same in a different order.
Test: atest mediaroutertest
Bug: 149887171

Change-Id: I10f6878ad42cf49f2337d2d69f884038b144df45
 2020-02-20 19:59:10 +09: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