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

384452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hall Liu
656fadca4f Merge "Add more nullability annotations" am: 3f2d69dc62 
am: 03a6eadb2d

Change-Id: Icce4efc896b2d246e7aa9463329ce9c4b88120d2
 2019-03-08 07:50:20 -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
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
Xiangyu/Malcolm Chen
879255e83e Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722 
am: 7a2dd73329

Change-Id: I5c19983a4830d65701e6a703a9a874eb27b4c2ef
 2019-03-08 07:00:19 -08:00
Brad Ebinger
44c64ec0a3 Merge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a 
am: 43663aa497

Change-Id: Ic06416fc68dd8ed12d09978cd96c5cfe7b376225
 2019-03-08 06:52:29 -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
Hall Liu
03a6eadb2d Merge "Add more nullability annotations" 
am: 3f2d69dc62

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

Change-Id: I51a716d1ee6b85bef347164061d1c12183612f50
 2019-03-08 06:42:23 -08:00
Brad Ebinger
ca4f185f0e Merge "Add nullability annotations in accordance with the council" am: 049c43f088 
am: 4a6dd7f3f0

Change-Id: I253a0adfd5dc6fc1d5a51bdcc2774b3e3da7f746
 2019-03-08 06:41:54 -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
Brad Ebinger
229e22d3fc Merge "Add CarrierConfig to use WFC home network mode in roaming network" am: 98868a718a 
am: 3c205266e3

Change-Id: I0cc2f5f362bd2edb5176bc287b7c4aa0c352c01b
 2019-03-08 06:33:47 -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
Xiangyu/Malcolm Chen
7a2dd73329 Merge "Adding callback for setPreferredDataSubscriptionId." 
am: 442084c722

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
 2019-03-08 06:19:31 -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
Brad Ebinger
43663aa497 Merge "Fix NPE in SmsManager and keep existing behavior" 
am: 8b95375a4a

Change-Id: I6b4d126b8b0a6a48bb91752dde2edd6af79b98b7
 2019-03-08 06:16:02 -08:00
Brad Ebinger
4a6dd7f3f0 Merge "Add nullability annotations in accordance with the council" 
am: 049c43f088

Change-Id: If13a487f14c6382aad010a3776dec76f7bf46738
 2019-03-08 06:12:38 -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
Brad Ebinger
3c205266e3 Merge "Add CarrierConfig to use WFC home network mode in roaming network" 
am: 98868a718a

Change-Id: Iabc46376d3b23d6462234c1eb9d1e9e389ac51dc
 2019-03-08 06:07:34 -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
Andrei Onea
a3c51f3f9b resolve merge conflicts of 04e04516b4 to stage-aosp-master 
am: c1d180cd7b

Change-Id: Ia7d489faec327e0da681b4bbbeb8f0653e5e1b7e
 2019-03-08 05:45:29 -08:00
Andrei Onea
c1d180cd7b resolve merge conflicts of 04e04516b4 to stage-aosp-master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
 2019-03-08 13:26:28 +00:00
Luke Huang
c8dfb72891 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Treehugger Robot
3f2d69dc62 Merge "Add more nullability annotations" 2019-03-08 03:16:43 +00:00
Bill Yi
64d0724451 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: a487c5840f -s ours
am skip reason: subject contains skip directive

Change-Id: I84207ea9ed424d36dc3a0d36a9582a8ef82854c2
 2019-03-07 18:23:59 -08:00
TreeHugger Robot
a487c5840f Merge "Import translations. DO NOT MERGE" into pi-dev 2019-03-08 00:55:04 +00:00
Chalard Jean
65087f4705 Merge "Support VPN Proxy(1/2)" 2019-03-08 00:34:25 +00:00
Varun Anand
cf88c4d657 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev 
am: aa7b93b167 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
 2019-03-07 16:21:09 -08: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
Varun Anand
aa7b93b167 Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev 2019-03-07 22:50:47 +00:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Brad Ebinger
8b95375a4a Merge "Fix NPE in SmsManager and keep existing behavior" 2019-03-07 22:27:19 +00:00
Brad Ebinger
049c43f088 Merge "Add nullability annotations in accordance with the council" 2019-03-07 21:14:18 +00:00
Brad Ebinger
98868a718a Merge "Add CarrierConfig to use WFC home network mode in roaming network" 2019-03-07 21:11:51 +00:00
Andrei-Valentin Onea
369804d4e4 Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5" into stage-aosp-master 
am: 75b9b48cec

Change-Id: I453444e35642df4effb287d2cd92558f8276cc14
 2019-03-07 12:19:03 -08: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