Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
470,403 Commits 3 Branches 0 Tags
5fd0b2e8d7923332b4eabbcd13a7e9f97bcf65da
Commit Graph

102424 Commits

Author SHA1 Message Date
Automerger Merge Worker
5fd0b2e8d7 Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8 am: 7e3f076b2c am: c4721f1fe4 am: bd6b5e3613 am: dd2a921cac 
Change-Id: If7940ffbb7cf8bd15b2e8f003b8a6a60f1119422
 2020-02-26 19:00:24 +00:00
Automerger Merge Worker
c4721f1fe4 Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8 am: 7e3f076b2c 
Change-Id: I2932905cba9dfff800e705289bca07c48898791c
 2020-02-26 18:14:24 +00:00
Automerger Merge Worker
7e3f076b2c Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8 
Change-Id: Iee457f25ea65b2507986f7e111341fc9924f56e3
 2020-02-26 18:01:50 +00:00
Automerger Merge Worker
03a66475ee Merge "WebView: Update setAllowFileAccess doc to reflect new default value" into rvc-dev am: 44e0da66e2 
Change-Id: If55a4a1c999920f7be27870dccf8488b4511605b
 2020-02-26 17:53:13 +00:00
TreeHugger Robot
44e0da66e2 Merge "WebView: Update setAllowFileAccess doc to reflect new default value" into rvc-dev 2020-02-26 17:43:13 +00:00
Automerger Merge Worker
2a0437f8d2 Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev am: 3944050acb 
Change-Id: I17c96b934b7a4fb6484f0383e843fd5740af33d0
 2020-02-26 17:26:32 +00:00
Joshua Duong
295dde7c7d Merge "Allow UsbDeviceManager to start adbd again." 2020-02-26 15:51:09 +00:00
Joshua Duong
7a3800993d Allow UsbDeviceManager to start adbd again. 
There's some weird state where if persist.sys.usb.config=none,adb, then
adbd won't get started. Give back adbd start permissions to
UsbDeviceManager to see if that fixes the issue.

Bug: 150130503

Test: adb shell su 0 setprop persist.sys.usb.config none,adb; adb reboot
adb should be online after.

Change-Id: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Exempt-From-Owner-Approval: Fix adbd offline failure
 2020-02-26 15:50:58 +00:00
Hazem Ashmawy
ee824f006b WebView: Update setAllowFileAccess doc to reflect new default value 
Update setAllowFileAccess java docs to reflect that it's now disabled by
default after merging crrev.com/c/2056824. Also add a note to use
androidx WebViewAssetLoader instead.

Bug: 148840827
Test: m offline-sdk-docs -j20
Change-Id: I15866ab63818771fd91f40828846d6b4c39d278e
(cherry picked from commit 47a4c2da51)
 2020-02-26 12:26:36 +00:00
Jerry Chang
30efde6a30 Prevent NPE whlie leaving windowless dream service. 
There might having windowless dream service like doze dream which won't
hava attached activity, so call finish() directly in onWakeUp() since
finish() itself deals with finishAndRemoveTask() as well.

Fix: b/150110220
Test: manual test, won't throw NPE while leaving doze service.
Change-Id: I982c2f6fb1859e869732ef8795b61bf96e8cff64
Merged-In: I982c2f6fb1859e869732ef8795b61bf96e8cff64
(cherry picked from commit 45f0d572c1)
 2020-02-26 10:56:29 +00:00
Automerger Merge Worker
1551fb7ac8 Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee24 am: 0233f238db am: 9315a51ac6 am: 9c4af35003 
Change-Id: I52f17a082c8eb6bf845ee3fbda1c8b51d50d17c9
 2020-02-26 03:49:12 +00:00
Automerger Merge Worker
9c4af35003 Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee24 am: 0233f238db am: 9315a51ac6 
Change-Id: Idbfe0550ce51557ff4a38fb7fade93fd01c20759
 2020-02-26 03:27:56 +00:00
Automerger Merge Worker
c0b4427aac Merge "Fine-tune the public APIs of allow rich content in Accessibility Settings for security." into rvc-dev am: 9c9ed396b5 am: 3e48115eb7 am: 9c0e132a0e 
Change-Id: Ibf64c22548e2d66deecf6d600bd8531bc291fafd
 2020-02-26 03:27:33 +00:00
Automerger Merge Worker
d42b6fa9b9 Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee24 
Change-Id: I40968d188143e87e02a0600c35a5c4d1d17b15d8
 2020-02-26 03:06:58 +00:00
TreeHugger Robot
da043aee24 Merge "Restore UnsupportedAppUsage method call" into rvc-dev 2020-02-26 03:05:31 +00:00
Automerger Merge Worker
647d514d47 Merge "Fine-tune the public APIs of allow rich content in Accessibility Settings for security." into rvc-dev am: 9c9ed396b5 
Change-Id: I3dc957c2fd4ff9b8bd03315af70494e3b4fee880
 2020-02-26 03:03:55 +00:00
PETER LIANG
9c9ed396b5 Merge "Fine-tune the public APIs of allow rich content in Accessibility Settings for security." into rvc-dev 2020-02-26 02:51:57 +00:00
Ryan Mitchell
93f2b3f9a2 Restore UnsupportedAppUsage method call 
4579c0aea2 changed the method signature
of the constructor of ResourcesKey, which is marked
UnsupportedappUsage. Restore the previous signature and provide a new
constructor that is hidden.

Bug: 147359613
Test: none
Change-Id: I391167e9064b1d88f4ad75200a190e5e3b0968cf
 2020-02-25 22:10:22 +00:00
Automerger Merge Worker
641cffdcf5 Merge "Merge "docs: Fix spelling of "environments"" into rvc-dev am: d697434fdc am: 36b77958fd am: efe4f42347" into rvc-qpr-dev-plus-aosp am: 3b3e9c5eeb 
Change-Id: I9580f6a12c5896e2961115a34730dc4b8e5e40c7
 2020-02-25 21:48:03 +00:00
Automerger Merge Worker
8707fc6200 Merge "docs: Fix spelling of "environments"" into rvc-dev am: d697434fdc am: 36b77958fd am: efe4f42347 
Change-Id: I3349f6dff92060bcdf61a618a73a3e733a873be9
 2020-02-25 21:31:50 +00:00
Automerger Merge Worker
e8e258ace4 Merge "docs: Fix spelling of "environments"" into rvc-dev am: d697434fdc 
Change-Id: I2e1a409d30ce508b036064126656b75024dea554
 2020-02-25 21:06:32 +00:00
Kevin Hufnagle
d697434fdc Merge "docs: Fix spelling of "environments"" into rvc-dev 2020-02-25 21:05:53 +00:00
Automerger Merge Worker
2f14645ca2 Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29f3 am: 95f38f3524 
Change-Id: Ib3ddb0e984ef118b77e324da27be36dcddef83c1
 2020-02-25 20:21:49 +00:00
Automerger Merge Worker
2895bf9d70 Merge "Atom for when fgs accesses appop" into rvc-dev am: 10398d29f3 
Change-Id: I05bd0d910df7d69a6a58cf32a4ebfdab43612e1a
 2020-02-25 20:11:48 +00:00
Rahul Sabnis
f9e92a836f Add missing RequiresPermission annotations in BluetoothHidHost and 
BluetoothMap APIs, disallow null device input for setConnectionPolicy,
getConnectionPolicy, and getConnectionState in BluetoothHidHost, and
BluetoothMap implements AutoCloseable, its close() method is public, and
utilizes a CloseGuard.

Bug: 149238030
Test: Manual
Change-Id: I8add9e26afcaf1a988c15e3cc7f8c446491f0686
 2020-02-25 12:03:48 -08:00
TreeHugger Robot
8cd339a8c8 Merge "Use display context all the way" 2020-02-25 19:59:57 +00:00
TreeHugger Robot
10398d29f3 Merge "Atom for when fgs accesses appop" into rvc-dev 2020-02-25 19:59:16 +00:00
Automerger Merge Worker
308627a58a Merge "Fix widget restore flow" into rvc-dev am: 7973854504 am: efe4556e5b am: 1c1a56191e am: 7c75da0a5e 
Change-Id: I01dcdc04a77491ed06f7a483e98dde70e0410c7e
 2020-02-25 19:49:28 +00:00
Automerger Merge Worker
68337eefea Merge "Add owners file Fixes: 150217454" into rvc-dev am: 3e4c88087d am: a3ad2aa370 am: 082d25399d am: 1a61f4f79a 
Change-Id: I8d97c23de62762855f7fd604697d39b678e6328b
 2020-02-25 19:47:29 +00:00
Automerger Merge Worker
7c75da0a5e Merge "Fix widget restore flow" into rvc-dev am: 7973854504 am: efe4556e5b am: 1c1a56191e 
Change-Id: I26ce7ab9451bd7e6f5c00bb1de69947bddcf098b
 2020-02-25 19:35:36 +00:00
Automerger Merge Worker
2df2829548 Add ID to InputEvent. am: c8362b24f6 am: 323e664b9e am: 3435f8beb5 
Change-Id: I9e75d3ac8701e93794cd4bfa8e09111f45d6618d
 2020-02-25 19:35:19 +00:00
Automerger Merge Worker
1a61f4f79a Merge "Add owners file Fixes: 150217454" into rvc-dev am: 3e4c88087d am: a3ad2aa370 am: 082d25399d 
Change-Id: Ib1fe19e1519b2db89e241fafcce6198fc03bcbc1
 2020-02-25 19:33:25 +00:00
Automerger Merge Worker
afbd22982b Merge "Fix widget restore flow" into rvc-dev am: 7973854504 
Change-Id: I0a08e4de896c13034ca4c5349b470a469d1fb5df
 2020-02-25 19:32:52 +00:00
TreeHugger Robot
7973854504 Merge "Fix widget restore flow" into rvc-dev 2020-02-25 19:31:08 +00:00
Automerger Merge Worker
81a3d0e2af Add ID to InputEvent. am: c8362b24f6 
Change-Id: I1041d8f81e49b7f9653061ef98e4fbe3d581d89d
 2020-02-25 19:23:13 +00:00
Automerger Merge Worker
323e664b9e Add ID to InputEvent. am: c8362b24f6 
Change-Id: I788a34a23a73d4af229f01e33d7cd3de1d52c544
 2020-02-25 19:23:10 +00:00
TreeHugger Robot
0253cc8f2f Merge changes from topics "input_events_id", "wire_input_event_id" into rvc-dev 
* changes:
  Send input event ID in InputEventSender.
  Add ID to InputEvent.
 2020-02-25 19:20:17 +00:00
Automerger Merge Worker
276baa734d Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e am: ec490f0812 am: 818ac58b61 am: b097e74b5b 
Change-Id: Icda59540b8298fb44ddf1cdab7f3653db720accc
 2020-02-25 19:12:48 +00:00
Automerger Merge Worker
7bb8c3022f Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 am: f84af9e79a am: d5f9d837bc am: cf42a5d1cf 
Change-Id: I1f06b61a4429bcaabd09609dd02ef73ecb781ec5
 2020-02-25 19:06:58 +00:00
Automerger Merge Worker
130fbe6da1 Merge "Add owners file Fixes: 150217454" into rvc-dev am: 3e4c88087d 
Change-Id: I71a0763bb0a8bc83e1c87638220e5f99c4a24d56
 2020-02-25 19:04:26 +00:00
Automerger Merge Worker
b097e74b5b Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e am: ec490f0812 am: 818ac58b61 
Change-Id: If3b3387d60d9b6a1e4e9b0d2a34fa5164a8b0d9c
 2020-02-25 19:01:06 +00:00
Automerger Merge Worker
cf42a5d1cf Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 am: f84af9e79a am: d5f9d837bc 
Change-Id: Id061a8aa919119a4147e75e6007a6a891d52c6c3
 2020-02-25 18:59:00 +00:00
Julia Reynolds
3e4c88087d Merge "Add owners file Fixes: 150217454" into rvc-dev 2020-02-25 18:54:45 +00:00
Julia Reynolds
36ff1ea03f Add owners file 
Fixes: 150217454

Change-Id: I80e624dd3de150cbf1cf50465cadb676256a4063
 2020-02-25 18:54:36 +00:00
Automerger Merge Worker
05e70b1ed6 Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 am: e2de88b6a4 am: b8655e302a am: ada481dcf9 
Change-Id: I4a60085142513a1602429c9058b78beaa6cfc98b
 2020-02-25 18:46:35 +00:00
Automerger Merge Worker
82abc4fb3b Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e 
Change-Id: I63d105659a7578774a9594609117939802b33a2d
 2020-02-25 18:34:42 +00:00
Automerger Merge Worker
cdf0080354 Merge changes I756b5834,Idce09cff am: a7fdceeba2 
Change-Id: I7c5e83f83518086a57525360ea25921e438bfe95
 2020-02-25 18:32:29 +00:00
Automerger Merge Worker
ada481dcf9 Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 am: e2de88b6a4 am: b8655e302a 
Change-Id: Iccd3c3edb6bdfc1eff0fa87157f7ef87ad710326
 2020-02-25 18:31:39 +00:00
Automerger Merge Worker
44dc451f44 Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 
Change-Id: Id7bd3935a660ffa1dc15f13e6de2a1efa454702f
 2020-02-25 18:31:17 +00:00
Peter Kalauskas
81a320279e Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev 
* changes:
  Disable reduced scale if reduced scale config is 0
  Store original task width and height instead of scale
 2020-02-25 18:29:50 +00:00