Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
464,898 Commits 3 Branches 0 Tags
b85646d57be10ed2b7c9eb7f71050091cbbd906c
Commit Graph

101356 Commits

Author SHA1 Message Date
TreeHugger Robot
b85646d57b Merge "Wipe device when COPE PO max password attemps exceeded" 2020-02-05 11:52:38 +00:00
Neil Fuller
1b883e2118 Merge "Remove System APIs not required for R" 2020-02-05 11:47:13 +00:00
Yuhan Zhao
be5015b00a Merge "Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor." 2020-02-05 07:42:49 +00:00
Marin Shalamanov
1ee05fd7b9 Merge "Update HDR capabilities and color modes when display changes." 2020-02-05 06:36:05 +00:00
Jacky Kao
dc50df397b Merge "Changing the return type of takeScreenshot() (1/n)" 2020-02-05 05:53:34 +00:00
Alex Buynytskyy
e59c8ad577 Merge "Minor renaming: IIncrementalManagerNative -> IIncrementalService." 2020-02-05 04:03:11 +00:00
Svetoslav Ganov
3e2213e035 Merge "Providing new accessibilityNode action" 2020-02-05 03:45:32 +00:00
Marin Shalamanov
677d3a7800 Update HDR capabilities and color modes when display changes. 
Pair: blindahl
Test: manual
Test: atest LocalDisplayAdapterTest
Bug: 146824575
Change-Id: I3cd1db3fc3b1df34c2af5e7c3f6905bca9bcbec5
 2020-02-05 03:41:45 +01:00
Automerger Merge Worker
6629e1cedd Merge "Finalize @SystemApi annotation" am: 8de85f4b50 am: da086e20c0 am: 031040a9b4 
Change-Id: Id6a9504b955a291129ea14a9ccc37b6d23f83d2b
 2020-02-05 02:13:00 +00:00
Automerger Merge Worker
031040a9b4 Merge "Finalize @SystemApi annotation" am: 8de85f4b50 am: da086e20c0 
Change-Id: I14206a0335665a8fea1cdc7ed33479ca4e7b38b2
 2020-02-05 02:00:25 +00:00
Automerger Merge Worker
da086e20c0 Merge "Finalize @SystemApi annotation" am: 8de85f4b50 
Change-Id: I33c752bd21ce66c95ef38530e3a28d48bb5d6946
 2020-02-05 01:46:48 +00:00
Alex Buynytskyy
716588dec9 Minor renaming: IIncrementalManagerNative -> IIncrementalService. 
Manager(client)->Service(server) seems to be easier to understand.

Test: builds
Bug: b/136132412 b/133435829
Change-Id: I3bc447fbf7a7aac917df7b4632def75e0da3f1a0
 2020-02-05 01:35:06 +00:00
Makoto Onuki
8de85f4b50 Merge "Finalize @SystemApi annotation" 2020-02-05 01:33:10 +00:00
Automerger Merge Worker
e7217d3eee Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 am: cd3f28071e am: 9514b54cfd 
Change-Id: I648f6be33a3b9ec4626fc991863df4645629d2a2
 2020-02-05 01:14:26 +00:00
Automerger Merge Worker
9514b54cfd Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 am: cd3f28071e 
Change-Id: I04f8786655f21b0dcf516f3dccb847424e45ce65
 2020-02-05 01:02:53 +00:00
Automerger Merge Worker
cd3f28071e Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 
Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642
 2020-02-05 00:50:59 +00:00
Rahul Sabnis
6d4004fc61 Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" 2020-02-05 00:41:33 +00:00
Automerger Merge Worker
3dfffac9c8 Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0 
Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca
 2020-02-05 00:24:10 +00:00
Howard Ro
dad078cb28 Merge "Don't extend StatsLogInternal" 2020-02-05 00:23:36 +00:00
Automerger Merge Worker
7846b824e0 Merge "Add separate user consent for Platform VPNs" am: ede31cad1c 
Change-Id: I38ceff087e37f6ede6819e706c36ee9129a1cc6b
 2020-02-05 00:07:41 +00:00
Benedict Wong
ede31cad1c Merge "Add separate user consent for Platform VPNs" 2020-02-04 23:56:16 +00:00
TreeHugger Robot
e9a69b5667 Merge "Deprecates ChooserTargetService APIs" 2020-02-04 23:10:13 +00:00
Automerger Merge Worker
e0c14895d6 Merge "Add getExtension to android.os.IBinder interface" am: 935dfd2ce9 am: 84642d37d5 am: fcc3a08dd4 
Change-Id: I3e36d8ab9a629377529afbb1c0276c79d3414a00
 2020-02-04 22:58:57 +00:00
Automerger Merge Worker
e7569b4e66 Merge "Add public API for EuiccService log dump" am: f22d8eac6f am: 6461a7e81c 
Change-Id: Id95165c739c86579e76bc4c9f3f19e4eb3f67ad7
 2020-02-04 22:44:17 +00:00
Automerger Merge Worker
fcc3a08dd4 Merge "Add getExtension to android.os.IBinder interface" am: 935dfd2ce9 am: 84642d37d5 
Change-Id: I7e67000c0434f9f8b72af643d4fd23892fcbbb6c
 2020-02-04 22:43:51 +00:00
TreeHugger Robot
4a15b70b66 Merge "Fix BLAST Surface release" 2020-02-04 22:41:40 +00:00
Yuhan Zhao
f3b3d41560 Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor. 
Test: Manual
Test: atest WmTests:ActivityRecordTests
Test: atest WmTests:ActivityStartInterceptorTest
Test: atest WmTests:LockTaskControllerTest
Bug: b/131614258
Screenshot: https://screenshot.googleplex.com/hPy1b9NgkNj
Change-Id: Ibba62d4cd0065cab9c46fcb575c207d1a88bd02f
 2020-02-04 14:38:39 -08:00
Automerger Merge Worker
6461a7e81c Merge "Add public API for EuiccService log dump" am: f22d8eac6f 
Change-Id: I1dc34f7a657a522826f0a8ed02ae726d9306150e
 2020-02-04 22:30:23 +00:00
Rahul Sabnis
99507b5eb3 Change data type of duration param from int representing seconds to long 
representing milliseconds in BluetoothAdapter#setScanMode

Bug: 144380530
Test: Manual
Change-Id: I76528478a64d22afefd4ec964d1a78295dd3c94f
 2020-02-04 14:29:09 -08:00
Automerger Merge Worker
84642d37d5 Merge "Add getExtension to android.os.IBinder interface" am: 935dfd2ce9 
Change-Id: I0379693d0c87e77eaed7dd133edb00c410d2dfd5
 2020-02-04 22:28:29 +00:00
Alex Lin
f22d8eac6f Merge "Add public API for EuiccService log dump" 2020-02-04 22:26:53 +00:00
Automerger Merge Worker
cc8a66cb12 Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e754115 am: 11e5071fbb am: 406f067b69 
Change-Id: I1e7159c7110dfd157f25d36bcfe75c56de8e026c
 2020-02-04 22:22:38 +00:00
Yo Chiang
935dfd2ce9 Merge "Add getExtension to android.os.IBinder interface" 2020-02-04 22:17:24 +00:00
Automerger Merge Worker
c98f1e7bcf Merge "Added data coding scheme and location check time support" am: ad194f332d am: e1f9b607d7 
Change-Id: I5dcdcc49bf45a311264c0fc72d0c41845768574d
 2020-02-04 22:09:54 +00:00
Automerger Merge Worker
406f067b69 Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e754115 am: 11e5071fbb 
Change-Id: I63f2cdcd2240b842614093761390bad866ef091b
 2020-02-04 22:08:52 +00:00
Automerger Merge Worker
e1f9b607d7 Merge "Added data coding scheme and location check time support" am: ad194f332d 
Change-Id: I475683bca98d019295726a21a487253ae09383a7
 2020-02-04 21:55:33 +00:00
Automerger Merge Worker
11e5071fbb Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" am: 715e754115 
Change-Id: I0d0c1be195ec894570c1fcbebca3f8b3298b1b34
 2020-02-04 21:49:42 +00:00
Makoto Onuki
e0d9a5a4f8 Finalize @SystemApi annotation 
Bug: 148177503
Test: Build & tree hugger
Change-Id: I4f2394afcc25cdb2b03d58ebcc8d3fb1e4962e1e
 2020-02-04 13:45:33 -08:00
Jack Yu
ad194f332d Merge "Added data coding scheme and location check time support" 2020-02-04 21:40:32 +00:00
Winson Chung
3d358dba3d Merge "Add lock task check when entering split screen" 2020-02-04 21:39:36 +00:00
Treehugger Robot
715e754115 Merge "Allow credstore to call into KeyAttestationApplicationIdProviderService" 2020-02-04 21:31:31 +00:00
Benedict Wong
526e7dd0b6 Add separate user consent for Platform VPNs 
This change adds a new VPN user consent flow (using the same text) for
granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new
PlatformVpnConfirmDialog is created as a subclass to preserve all logic,
but ensure the right appop is granted for the relevant dialog.

Intent extras were considered, but are inherently unsafe, since the
caller may add any extras that they would want.

Bug: 144246835
Test: FrameworksNetTests passing
Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3
Merged-In: Ia6f36207d43c3748f938430c2780dcf29e5623f3
 2020-02-04 21:05:36 +00:00
Benedict Wong
70ee4c46a6 Merge "Add separate user consent for Platform VPNs" 2020-02-04 21:04:01 +00:00
Pavel Grafov
a5b15b2531 Wipe device when COPE PO max password attemps exceeded 
With this change when DPMS decides what user to wipe, it takes COPE
status into account.

Bug: 144978468
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I3841b04321090fdc035da91fdc1febea397640bb
 2020-02-04 19:46:09 +00:00
Muhammad Qureshi
c5b609e6b0 Don't extend StatsLogInternal 
Remove StatsLogInternal extension from StatsLog

Bug: 145952197
Test: m
Change-Id: Icd8e87315178f3b73f3ff8da07d355e29d297e7e
 2020-02-04 11:25:16 -08:00
Robert Carr
3e5f001d30 Fix BLAST Surface release 
The call to relayout may release the SurfaceControl for us by
reading back a null parcel. In this case remove will throw an exception.
We could check is valid, but actually we don't need to call remove
just release, which doesn't throw an exception if already released.

Bug: 146598493
Bug: 148692069
Test: Flip USE_BLAST_ADAPTER device boots.

Change-Id: I38ee8df702dc2645ca5da980bebdc5ac32a7a065
 2020-02-04 11:07:18 -08:00
Neil Fuller
567a91279f Remove System APIs not required for R 
Test: treehugger
Bug: 148842434
Change-Id: If022a726a058a90cb5446d220628c76800da8e96
 2020-02-04 18:59:23 +00:00
Jack Yu
eba90e264a Added data coding scheme and location check time support 
AT&T requires showing data coding scheme, location check
time, whether shown to the user or not in the test menu.
Expanded database to support this.

Bug: 144152683
Test: Manully sending fake messages and verified database
Merged-In: Ib5b78802e7548da9f92492aae4c94ed3488b5e3d
Change-Id: Ib5b78802e7548da9f92492aae4c94ed3488b5e3d
(cherry picked from commit 641db9a36a)
 2020-02-04 10:39:52 -08:00
TreeHugger Robot
26fc52f729 Merge "enable dynamic binding in AppPredictionSession" 2020-02-04 17:50:32 +00:00
Dianne Hackborn
f27a9578e5 Merge "Work on issue #143085640: Per-process network access control" 2020-02-04 17:30:52 +00:00