Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384,488 Commits 3 Branches 0 Tags
c640787c11f4d9f1ea137f85161f311ea151c335
Commit Graph

93628 Commits

Author SHA1 Message Date
Max Bires
c640787c11 Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am: 18e0781d3d 
am: e6faa759d6

Change-Id: Ib0c090a9b54086fa1f0dcac9380584365fa59ed2
 2019-03-08 10:54:49 -08:00
Max Bires
e6faa759d6 Merge "Adding KEY_PERMANENTLY_INVALIDATED int" 
am: 18e0781d3d

Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213
 2019-03-08 10:22:53 -08:00
Max Bires
18e0781d3d Merge "Adding KEY_PERMANENTLY_INVALIDATED int" 2019-03-08 17:53:05 +00:00
Bernie Innocenti
6f6fc40839 Merge "Add junyulai@ as owner of the core networking dirs" am: e5e3ac639b 
am: b0498ba448

Change-Id: Ic47555bcaf336a09f6e79fd570e93bc665bb7714
 2019-03-08 08:58:44 -08:00
Ugo Yu
99c86ecda5 Merge "Change BluetoothCodecStatus.sameCapabilities() to public" am: 27a6501a19 
am: 8db54f6563

Change-Id: I2318a03f8b94622de55291dc9f792393746166c8
 2019-03-08 08:39:25 -08:00
Luke Huang
6a047b2645 Merge "Minor changes to the async DNS query JAVA API" am: c8dfb72891 
am: 5b0b36a6b4

Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7
 2019-03-08 07:56:33 -08:00
Bernie Innocenti
b0498ba448 Merge "Add junyulai@ as owner of the core networking dirs" 
am: e5e3ac639b

Change-Id: I06cca33e638baf671b891eb0c20b4c8f439eda2e
 2019-03-08 07:50:29 -08:00
Chalard Jean
ff3d9bb029 Merge "Support VPN Proxy(1/2)" am: 65087f4705 
am: ba4a9abe35

Change-Id: Ie17bfbc464ee72ef5c6a075b15ecd59c405f3d7a
 2019-03-08 07:44:13 -08:00
cnx421
3069e2ba6f Merge "fix 'int android.view.View.getHeight()' on a null object reference" am: 4add708b91 
am: 6a5d589a50

Change-Id: I44fc06d18b963b01ef2c894d515567bb7aac2620
 2019-03-08 07:24:54 -08:00
Bernie Innocenti
e5e3ac639b Merge "Add junyulai@ as owner of the core networking dirs" 2019-03-08 15:21:01 +00:00
Benedict Wong
836402e0e8 Merge changes Ie66ba631,Ic42c09a3 am: cbc409986d 
am: 788be6d63a

Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2
 2019-03-08 07:19:17 -08:00
David Brazdil
847b02cac4 Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0 
am: 7746e7c553

Change-Id: I2d812e9a4bcb1e64b736a84da9a33e4275a4f503
 2019-03-08 07:13:46 -08:00
Stanley Tng
4929093ff7 Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25 
am: 1c5a742cb8

Change-Id: I50416d50c0723bbf33d83226c5536287096de75d
 2019-03-08 07:07:56 -08:00
Ugo Yu
8db54f6563 Merge "Change BluetoothCodecStatus.sameCapabilities() to public" 
am: 27a6501a19

Change-Id: Ib061fe25ba0ec460b601c893f0a1396626e00331
 2019-03-08 07:01:55 -08:00
Luke Huang
5b0b36a6b4 Merge "Minor changes to the async DNS query JAVA API" 
am: c8dfb72891

Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
 2019-03-08 06:51:48 -08:00
Chalard Jean
ba4a9abe35 Merge "Support VPN Proxy(1/2)" 
am: 65087f4705

Change-Id: I51a716d1ee6b85bef347164061d1c12183612f50
 2019-03-08 06:42:23 -08:00
cnx421
6a5d589a50 Merge "fix 'int android.view.View.getHeight()' on a null object reference" 
am: 4add708b91

Change-Id: I3aa9c2da09a1447f79edb6a228f88cdc731bd605
 2019-03-08 06:38:44 -08:00
Benedict Wong
788be6d63a Merge changes Ie66ba631,Ic42c09a3 
am: cbc409986d

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
 2019-03-08 06:35:04 -08:00
David Brazdil
7746e7c553 Merge "Move Camera.EventHandler constructor to greylist" 
am: b31032b3b0

Change-Id: If785b7e4f01db0a0e9b1e8d4e42258375de57dbc
 2019-03-08 06:29:15 -08:00
Ruchi Kandoi
0baada5d2a Merge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2 
am: 049cd3b67e

Change-Id: Ie61c0db82f40015f743bf7455b1c8850337bca7d
 2019-03-08 06:27:29 -08:00
Stanley Tng
1c5a742cb8 Merge "Add @NonNull annotations to Hearing Aids Profile APIs" 
am: 6fa52c9b25

Change-Id: If06dc28087ad2fe14636e0147077b35af7947216
 2019-03-08 06:25:47 -08:00
Andrei-Valentin Onea
4a4717bcee Merge "Add @UnsupportedAppUsage annotations" am: 10c573ff85 
am: f63b6157a1

Change-Id: I5b6a5b23442900ae87ed19bbcdf503845405d518
 2019-03-08 06:18:00 -08:00
Andrei-Valentin Onea
2714fef0e5 Merge "Add @UnsupportedAppUsage annotations" am: 5d256870aa 
am: 42f62d86b5

Change-Id: I43315449d7354eafcc818350890447d1f494ba27
 2019-03-08 06:12:19 -08:00
Siarhei Vishniakou
bee3e01c9b Merge "Add a null check for getWindow()" am: 3c69948e6a 
am: 71f52a6a0d

Change-Id: I41fbd9c87b360f7d4fd049cb313856bceeff0dee
 2019-03-08 06:04:23 -08:00
Ruchi Kandoi
049cd3b67e Merge "Add @NonNull annotations to (un)setOffHostForService()" 
am: 78366e46b2

Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3
 2019-03-08 06:03:45 -08:00
Andrei-Valentin Onea
f63b6157a1 Merge "Add @UnsupportedAppUsage annotations" 
am: 10c573ff85

Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94
 2019-03-08 06:00:20 -08:00
Andrei-Valentin Onea
42f62d86b5 Merge "Add @UnsupportedAppUsage annotations" 
am: 5d256870aa

Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a
 2019-03-08 05:56:53 -08:00
Siarhei Vishniakou
71f52a6a0d Merge "Add a null check for getWindow()" 
am: 3c69948e6a

Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
 2019-03-08 05:53:28 -08:00
Bernie Innocenti
ea89cf2c6e Add junyulai@ as owner of the core networking dirs 
Also removed emeritus accounts ek@ and silberst@ from various places.
A cleanup using 'include' would probably be in order...

Test: N/A
Change-Id: I575e60dd5e600e42d9571ce8e8d7661d30e99bfe
 2019-03-08 13:04:05 +00:00
Treehugger Robot
27a6501a19 Merge "Change BluetoothCodecStatus.sameCapabilities() to public" 2019-03-08 10:38:47 +00:00
Luke Huang
c8dfb72891 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Chalard Jean
65087f4705 Merge "Support VPN Proxy(1/2)" 2019-03-08 00:34:25 +00:00
Treehugger Robot
4add708b91 Merge "fix 'int android.view.View.getHeight()' on a null object reference" 2019-03-08 00:19:39 +00:00
Benedict Wong
cbc409986d Merge changes Ie66ba631,Ic42c09a3 
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
 2019-03-07 23:32:55 +00:00
Treehugger Robot
b31032b3b0 Merge "Move Camera.EventHandler constructor to greylist" 2019-03-07 23:16:40 +00:00
Treehugger Robot
6fa52c9b25 Merge "Add @NonNull annotations to Hearing Aids Profile APIs" 2019-03-07 22:59:06 +00:00
Treehugger Robot
78366e46b2 Merge "Add @NonNull annotations to (un)setOffHostForService()" 2019-03-07 20:07:16 +00:00
Andrei-Valentin Onea
1c701f1427 Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5 
am: 5d01988bcf

Change-Id: Ie96c7a5659546dfe7da6e35f2b44fc6a2574b181
 2019-03-07 11:51:33 -08:00
Andrei-Valentin Onea
5d01988bcf Merge "Add @UnsupportedAppUsage annotations" 
am: 315404a9a5

Change-Id: I281b0d628f1201e88d4c7c3a764f5a55392dadaa
 2019-03-07 11:10:22 -08:00
David Brazdil
982df3ba83 Move Camera.EventHandler constructor to greylist 
Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 122331906
Test: m appcompat
Change-Id: I3abc8221706bd69668c90aa61b8ca5f137a88bb9
 2019-03-07 17:44:10 +00:00
Andrei-Valentin Onea
10c573ff85 Merge "Add @UnsupportedAppUsage annotations" 2019-03-07 17:26:15 +00:00
Andrei-Valentin Onea
5d256870aa Merge "Add @UnsupportedAppUsage annotations" 2019-03-07 17:26:09 +00:00
Treehugger Robot
3c69948e6a Merge "Add a null check for getWindow()" 2019-03-07 17:02:00 +00:00
Andrei-Valentin Onea
315404a9a5 Merge "Add @UnsupportedAppUsage annotations" 2019-03-07 16:30:32 +00:00
Mark Chien
95ca226658 Merge "Fix TetheringEntitlementValueListener related API" am: fbcc63d51f 
am: 16c5a5c6f4

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
 2019-03-07 05:41:46 -08:00
Mark Chien
16c5a5c6f4 Merge "Fix TetheringEntitlementValueListener related API" 
am: fbcc63d51f

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
 2019-03-07 05:32:33 -08:00
Mark Chien
fbcc63d51f Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Andrei-Valentin Onea
918fd7934b Merge "Add @UnsupportedAppUsage annotations" am: 722dff1f35 
am: 7b577b39f7

Change-Id: I2d532044b9eb62ff595fa648a239b907a32d0bab
 2019-03-07 02:41:23 -08:00
Andrei-Valentin Onea
7b577b39f7 Merge "Add @UnsupportedAppUsage annotations" 
am: 722dff1f35

Change-Id: I559e8abb355a41119d9cd86a497fbdbd69157f9b
 2019-03-07 02:32:26 -08:00
Andrei-Valentin Onea
722dff1f35 Merge "Add @UnsupportedAppUsage annotations" 2019-03-07 10:20:28 +00:00