OSDN Git Service
Sasha Smundak [Fri, 8 Mar 2019 23:33:18 +0000 (15:33 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp" am:
40ff4f7d83
am:
c33506ce2f
Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4
Sasha Smundak [Fri, 8 Mar 2019 23:20:09 +0000 (15:20 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp"
am:
40ff4f7d83
Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
Treehugger Robot [Fri, 8 Mar 2019 22:54:11 +0000 (22:54 +0000)]
Merge "Convert tests/**/Android.mk files to Android.bp"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:52:01 +0000 (14:52 -0800)]
Merge "update getStaticPhoneCapability to use HAL instead of default value" am:
9e6f5d1521
am:
109f4590ca
Change-Id: I2b43c2ad3f6e6b6789a6f124fce43d8d87b9d8c0
Nazanin Bakhshi [Fri, 8 Mar 2019 22:41:14 +0000 (14:41 -0800)]
Merge "make onActiveDataSubId in PhoneStateListener public API" am:
dfe984c3fe
am:
558a5e2632
Change-Id: Iecac7b32f88a2b4d8d3236b2e571dde832b49044
Nazanin Bakhshi [Fri, 8 Mar 2019 22:31:03 +0000 (14:31 -0800)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
am:
9e6f5d1521
Change-Id: Ib146ba3b8a7db7ed151ea721ceb57b21e4b44ac3
Irina Dumitrescu [Fri, 8 Mar 2019 22:26:20 +0000 (14:26 -0800)]
Merge "Add Keystore get option that supresses caught exceptions warnings." am:
f070b51670
am:
7bf37cf83d
Change-Id: I90d0e2f575f8291093e76d9b4908e3ff02e8f168
Nazanin Bakhshi [Fri, 8 Mar 2019 22:21:29 +0000 (14:21 -0800)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
am:
dfe984c3fe
Change-Id: Ic385f5372535220bbeda6351974b22081a2e8b30
Irina Dumitrescu [Fri, 8 Mar 2019 22:16:35 +0000 (14:16 -0800)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
am:
f070b51670
Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef
Treehugger Robot [Fri, 8 Mar 2019 22:05:59 +0000 (22:05 +0000)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:00:33 +0000 (22:00 +0000)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
Treehugger Robot [Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
Nathan Harold [Fri, 8 Mar 2019 19:56:04 +0000 (11:56 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support" am:
f899e26857
am:
8dada71897
Change-Id: I402d3dfbaba9fabdd65956fd23b3879d0d77df7e
Nazanin Bakhshi [Wed, 6 Mar 2019 23:31:45 +0000 (15:31 -0800)]
update getStaticPhoneCapability to use HAL instead of default value
Bug:
123359867
Test: build
Change-Id: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
Merged-In: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
(cherry picked from commit
1772247b044795cdad1fa22069040df0bf657f42)
Nathan Harold [Fri, 8 Mar 2019 19:39:33 +0000 (11:39 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support"
am:
f899e26857
Change-Id: I9f96a8846bfb137bdcae8d8495188229637fac2c
Nazanin Bakhshi [Fri, 8 Mar 2019 19:29:56 +0000 (11:29 -0800)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am:
016409b3d5
am:
26891a4429
Change-Id: Ic9600095313ed557a119f9e0dd656b9230dd3056
Nazanin Bakhshi [Fri, 1 Mar 2019 18:10:22 +0000 (10:10 -0800)]
make onActiveDataSubId in PhoneStateListener public API
Bug:
124260187
Test: CTS
Change-Id: I6e5a5c8273348d822b8f552599784b8e986850bf
Merged-In: I6e5a5c8273348d822b8f552599784b8e986850bf
(cherry picked from commit
026c42d7521c390b171f2b42a9b961fdc325b44a)
Nathan Harold [Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support"
Max Bires [Fri, 8 Mar 2019 18:54:49 +0000 (10:54 -0800)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am:
18e0781d3d
am:
e6faa759d6
Change-Id: Ib0c090a9b54086fa1f0dcac9380584365fa59ed2
Nazanin Bakhshi [Fri, 8 Mar 2019 18:45:20 +0000 (10:45 -0800)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am:
016409b3d5
Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
Tyler Gunn [Fri, 8 Mar 2019 18:28:50 +0000 (10:28 -0800)]
Merge "Add carrier config key for TTY support." am:
16f6deae44
am:
61ccd176f0
Change-Id: Ia4efbe04195934e4320ac3ae9f9eaf49ee66350f
Nazanin Bakhshi [Fri, 8 Mar 2019 18:25:59 +0000 (18:25 +0000)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
Max Bires [Fri, 8 Mar 2019 18:22:53 +0000 (10:22 -0800)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
am:
18e0781d3d
Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213
Tyler Gunn [Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)]
Merge "Add carrier config key for TTY support."
am:
16f6deae44
Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f
David Anderson [Fri, 8 Mar 2019 18:11:47 +0000 (10:11 -0800)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes." am:
1451b2f3a5
am:
123a9ed245
Change-Id: I4c1b812fa60beee87a59efa9385e2d2bb3b21117
David Anderson [Fri, 8 Mar 2019 17:55:40 +0000 (09:55 -0800)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
am:
1451b2f3a5
Change-Id: I09b53ae751ffdff9e7fa31a8e5ee347bf42a347c
Max Bires [Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
Tyler Gunn [Fri, 8 Mar 2019 17:52:52 +0000 (17:52 +0000)]
Merge "Add carrier config key for TTY support."
David Anderson [Fri, 8 Mar 2019 17:39:44 +0000 (17:39 +0000)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
Andrei-Valentin Onea [Fri, 8 Mar 2019 17:38:49 +0000 (09:38 -0800)]
Merge "Add extra hidden api related tags" am:
cfd72b9386
am:
d63ef04944
Change-Id: I90ad865bda1bb1efb66628e91ea4ec0758579e0a
Chalard Jean [Fri, 8 Mar 2019 17:13:00 +0000 (09:13 -0800)]
Merge "Give Telephony the permissions to access the network stack." am:
a6f3476476
am:
1dba2f82ad
Change-Id: I94d4e4903f303ead2193a64578a605a311cc5be8
Bernie Innocenti [Fri, 8 Mar 2019 16:58:44 +0000 (08:58 -0800)]
Merge "Add junyulai@ as owner of the core networking dirs" am:
e5e3ac639b
am:
b0498ba448
Change-Id: Ic47555bcaf336a09f6e79fd570e93bc665bb7714
Jimmy Chen [Fri, 8 Mar 2019 16:47:45 +0000 (08:47 -0800)]
Merge "IPv6: enable IPv6 link local routing for local network" am:
f635f12666
am:
32b60b59b1
Change-Id: I1d9c635839bc0e191fa5339a6a240bf21ef4ec5c
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:43:07 +0000 (08:43 -0800)]
Merge "Add extra hidden api related tags"
am:
cfd72b9386
Change-Id: I547a0596de397469e02d88a524610c546c59f5f7
Ugo Yu [Fri, 8 Mar 2019 16:39:25 +0000 (08:39 -0800)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public" am:
27a6501a19
am:
8db54f6563
Change-Id: I2318a03f8b94622de55291dc9f792393746166c8
Chalard Jean [Fri, 8 Mar 2019 16:38:35 +0000 (08:38 -0800)]
Merge "Give Telephony the permissions to access the network stack."
am:
a6f3476476
Change-Id: I4ae09aac25226904e34d77edb7333da0aabe86f9
Chiachang Wang [Fri, 8 Mar 2019 16:31:12 +0000 (08:31 -0800)]
Merge "Not to use any() to verify DataStallDetectionStats" am:
18e931ba12
am:
b0ccd2517e
Change-Id: Ib3b571548880f21a02b8c6e39b16b73c19614d54
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:22:11 +0000 (16:22 +0000)]
Merge "Add extra hidden api related tags"
Luke Huang [Fri, 8 Mar 2019 15:56:33 +0000 (07:56 -0800)]
Merge "Minor changes to the async DNS query JAVA API" am:
c8dfb72891
am:
5b0b36a6b4
Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7
Treehugger Robot [Fri, 8 Mar 2019 15:55:53 +0000 (15:55 +0000)]
Merge "Give Telephony the permissions to access the network stack."
Bernie Innocenti [Fri, 8 Mar 2019 15:50:29 +0000 (07:50 -0800)]
Merge "Add junyulai@ as owner of the core networking dirs"
am:
e5e3ac639b
Change-Id: I06cca33e638baf671b891eb0c20b4c8f439eda2e
Hall Liu [Fri, 8 Mar 2019 15:50:20 +0000 (07:50 -0800)]
Merge "Add more nullability annotations" am:
3f2d69dc62
am:
03a6eadb2d
Change-Id: Icce4efc896b2d246e7aa9463329ce9c4b88120d2
Chalard Jean [Fri, 8 Mar 2019 15:44:13 +0000 (07:44 -0800)]
Merge "Support VPN Proxy(1/2)" am:
65087f4705
am:
ba4a9abe35
Change-Id: Ie17bfbc464ee72ef5c6a075b15ecd59c405f3d7a
Jimmy Chen [Fri, 8 Mar 2019 15:38:41 +0000 (07:38 -0800)]
Merge "IPv6: enable IPv6 link local routing for local network"
am:
f635f12666
Change-Id: I3f5ecbd047d9205c9430610c7d6fa9400ab587d4
cnx421 [Fri, 8 Mar 2019 15:24:54 +0000 (07:24 -0800)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference" am:
4add708b91
am:
6a5d589a50
Change-Id: I44fc06d18b963b01ef2c894d515567bb7aac2620
Bernie Innocenti [Fri, 8 Mar 2019 15:21:01 +0000 (15:21 +0000)]
Merge "Add junyulai@ as owner of the core networking dirs"
Benedict Wong [Fri, 8 Mar 2019 15:19:17 +0000 (07:19 -0800)]
Merge changes Ie66ba631,Ic42c09a3 am:
cbc409986d
am:
788be6d63a
Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2
David Brazdil [Fri, 8 Mar 2019 15:13:46 +0000 (07:13 -0800)]
Merge "Move Camera.EventHandler constructor to greylist" am:
b31032b3b0
am:
7746e7c553
Change-Id: I2d812e9a4bcb1e64b736a84da9a33e4275a4f503
Jimmy Chen [Fri, 8 Mar 2019 15:08:07 +0000 (15:08 +0000)]
Merge "IPv6: enable IPv6 link local routing for local network"
Stanley Tng [Fri, 8 Mar 2019 15:07:56 +0000 (07:07 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am:
6fa52c9b25
am:
1c5a742cb8
Change-Id: I50416d50c0723bbf33d83226c5536287096de75d
Ugo Yu [Fri, 8 Mar 2019 15:01:55 +0000 (07:01 -0800)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public"
am:
27a6501a19
Change-Id: Ib061fe25ba0ec460b601c893f0a1396626e00331
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 15:00:19 +0000 (07:00 -0800)]
Merge "Adding callback for setPreferredDataSubscriptionId." am:
442084c722
am:
7a2dd73329
Change-Id: I5c19983a4830d65701e6a703a9a874eb27b4c2ef
Chiachang Wang [Fri, 8 Mar 2019 14:57:24 +0000 (06:57 -0800)]
Merge "Not to use any() to verify DataStallDetectionStats"
am:
18e931ba12
Change-Id: I7510070bc3f68386d9b222fc14342e08fc6e9b22
Brad Ebinger [Fri, 8 Mar 2019 14:52:29 +0000 (06:52 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior" am:
8b95375a4a
am:
43663aa497
Change-Id: Ic06416fc68dd8ed12d09978cd96c5cfe7b376225
Luke Huang [Fri, 8 Mar 2019 14:51:48 +0000 (06:51 -0800)]
Merge "Minor changes to the async DNS query JAVA API"
am:
c8dfb72891
Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
Hall Liu [Fri, 8 Mar 2019 14:46:46 +0000 (06:46 -0800)]
Merge "Add more nullability annotations"
am:
3f2d69dc62
Change-Id: I9b815b25cd48a5e24506f3f50fc6370bac1af552
Chalard Jean [Fri, 8 Mar 2019 14:42:23 +0000 (06:42 -0800)]
Merge "Support VPN Proxy(1/2)"
am:
65087f4705
Change-Id: I51a716d1ee6b85bef347164061d1c12183612f50
Brad Ebinger [Fri, 8 Mar 2019 14:41:54 +0000 (06:41 -0800)]
Merge "Add nullability annotations in accordance with the council" am:
049c43f088
am:
4a6dd7f3f0
Change-Id: I253a0adfd5dc6fc1d5a51bdcc2774b3e3da7f746
cnx421 [Fri, 8 Mar 2019 14:38:44 +0000 (06:38 -0800)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference"
am:
4add708b91
Change-Id: I3aa9c2da09a1447f79edb6a228f88cdc731bd605
Benedict Wong [Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)]
Merge changes Ie66ba631,Ic42c09a3
am:
cbc409986d
Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
Brad Ebinger [Fri, 8 Mar 2019 14:33:47 +0000 (06:33 -0800)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network" am:
98868a718a
am:
3c205266e3
Change-Id: I0cc2f5f362bd2edb5176bc287b7c4aa0c352c01b
David Brazdil [Fri, 8 Mar 2019 14:29:15 +0000 (06:29 -0800)]
Merge "Move Camera.EventHandler constructor to greylist"
am:
b31032b3b0
Change-Id: If785b7e4f01db0a0e9b1e8d4e42258375de57dbc
Ruchi Kandoi [Fri, 8 Mar 2019 14:27:29 +0000 (06:27 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()" am:
78366e46b2
am:
049cd3b67e
Change-Id: Ie61c0db82f40015f743bf7455b1c8850337bca7d
Stanley Tng [Fri, 8 Mar 2019 14:25:47 +0000 (06:25 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
am:
6fa52c9b25
Change-Id: If06dc28087ad2fe14636e0147077b35af7947216
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 14:19:31 +0000 (06:19 -0800)]
Merge "Adding callback for setPreferredDataSubscriptionId."
am:
442084c722
Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:18:00 +0000 (06:18 -0800)]
Merge "Add @UnsupportedAppUsage annotations" am:
10c573ff85
am:
f63b6157a1
Change-Id: I5b6a5b23442900ae87ed19bbcdf503845405d518
Brad Ebinger [Fri, 8 Mar 2019 14:16:02 +0000 (06:16 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior"
am:
8b95375a4a
Change-Id: I6b4d126b8b0a6a48bb91752dde2edd6af79b98b7
Brad Ebinger [Fri, 8 Mar 2019 14:12:38 +0000 (06:12 -0800)]
Merge "Add nullability annotations in accordance with the council"
am:
049c43f088
Change-Id: If13a487f14c6382aad010a3776dec76f7bf46738
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:12:19 +0000 (06:12 -0800)]
Merge "Add @UnsupportedAppUsage annotations" am:
5d256870aa
am:
42f62d86b5
Change-Id: I43315449d7354eafcc818350890447d1f494ba27
Brad Ebinger [Fri, 8 Mar 2019 14:07:34 +0000 (06:07 -0800)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network"
am:
98868a718a
Change-Id: Iabc46376d3b23d6462234c1eb9d1e9e389ac51dc
Siarhei Vishniakou [Fri, 8 Mar 2019 14:04:23 +0000 (06:04 -0800)]
Merge "Add a null check for getWindow()" am:
3c69948e6a
am:
71f52a6a0d
Change-Id: I41fbd9c87b360f7d4fd049cb313856bceeff0dee
Ruchi Kandoi [Fri, 8 Mar 2019 14:03:45 +0000 (06:03 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()"
am:
78366e46b2
Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:00:20 +0000 (06:00 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
10c573ff85
Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94
Andrei-Valentin Onea [Fri, 8 Mar 2019 13:56:53 +0000 (05:56 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
5d256870aa
Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a
Siarhei Vishniakou [Fri, 8 Mar 2019 13:53:28 +0000 (05:53 -0800)]
Merge "Add a null check for getWindow()"
am:
3c69948e6a
Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
Andrei Onea [Fri, 8 Mar 2019 13:45:29 +0000 (05:45 -0800)]
resolve merge conflicts of
04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
am:
c1d180cd7b
Change-Id: Ia7d489faec327e0da681b4bbbeb8f0653e5e1b7e
Andrei Onea [Fri, 8 Mar 2019 12:34:28 +0000 (12:34 +0000)]
resolve merge conflicts of
04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
Bernie Innocenti [Fri, 8 Mar 2019 11:28:35 +0000 (20:28 +0900)]
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
Chalard Jean [Fri, 8 Mar 2019 10:46:00 +0000 (19:46 +0900)]
Give Telephony the permissions to access the network stack.
Test: manual
Change-Id: I28308f421aa955fe110b50452b115a0178b24745
Treehugger Robot [Fri, 8 Mar 2019 10:38:47 +0000 (10:38 +0000)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public"
Treehugger Robot [Fri, 8 Mar 2019 09:26:05 +0000 (09:26 +0000)]
Merge "Not to use any() to verify DataStallDetectionStats"
Jimmy Chen [Thu, 7 Mar 2019 06:15:36 +0000 (14:15 +0800)]
IPv6: enable IPv6 link local routing for local network
IPv6 link local is an automatically configured address. The routing should be
activated regardless of the DHCP service.
Bug:
126063997
Test: Unit tests - atest FrameworksNetTests
Test: Unit tests - atest FrameworksWifiTests
Test: * DUT1 enables hotspot
* DUT2 associates to DUT1
* use ping6 to verify the local link on both side
Test: * DUT1 creates a P2P group
* DUT2 joins this group as a legacy client
* use ping6 to verify the local link on both side
Change-Id: I102bf29e8da14808097e43c840d74d41b6b3758f
Chiachang Wang [Fri, 8 Mar 2019 06:34:19 +0000 (14:34 +0800)]
Not to use any() to verify DataStallDetectionStats
Build a empty DataStallDetectionStats object instead of use
any() to do the verification to prevent NPE while trying to
write the metrics.
Bug:
120452078
Test: atest NetworkStackTests
Change-Id: Ib9f3e56195a539a5ca4826b4aad0e38945a9a3a7
Luke Huang [Fri, 8 Mar 2019 03:19:55 +0000 (03:19 +0000)]
Merge "Minor changes to the async DNS query JAVA API"
Treehugger Robot [Fri, 8 Mar 2019 03:16:43 +0000 (03:16 +0000)]
Merge "Add more nullability annotations"
Bill Yi [Fri, 8 Mar 2019 02:23:59 +0000 (18:23 -0800)]
[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
TreeHugger Robot [Fri, 8 Mar 2019 00:55:04 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Chalard Jean [Fri, 8 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Support VPN Proxy(1/2)"
Varun Anand [Fri, 8 Mar 2019 00:21:09 +0000 (16:21 -0800)]
[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
Treehugger Robot [Fri, 8 Mar 2019 00:19:39 +0000 (00:19 +0000)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference"
Sasha Smundak [Thu, 21 Feb 2019 00:52:48 +0000 (16:52 -0800)]
Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information.
Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet
ported to internal master. Do it later.
Note: the conversion in the following directories has to be done in the
internal master first because of the conflicts:
* tests/ActivityManagerPerfTests
* tests/AppLaunch
* tests/AppLaunchWear
* tests/BackgroundDexOptServiceIntegrationTests
* tests/Camera2Tests/CameraToo
* tests/Camera2Tests/SmartCamera/SimpleCamera
* tests/Compatibility
* tests/Internal
* tests/RcsTests
* tests/ServiceCrashTest
* tests/UsbTests
Bug:
122332340
Test: treehugger
Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
Benedict Wong [Thu, 7 Mar 2019 23:32:55 +0000 (23:32 +0000)]
Merge changes Ie66ba631,Ic42c09a3
* changes:
Implement TestNetworkService
Add shell TestNetworkManager and Service
Treehugger Robot [Thu, 7 Mar 2019 23:16:40 +0000 (23:16 +0000)]
Merge "Move Camera.EventHandler constructor to greylist"
Treehugger Robot [Thu, 7 Mar 2019 22:59:06 +0000 (22:59 +0000)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
Varun Anand [Thu, 7 Mar 2019 22:50:47 +0000 (22:50 +0000)]
Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev
Xiangyu/Malcolm Chen [Thu, 7 Mar 2019 22:47:31 +0000 (22:47 +0000)]
Merge "Adding callback for setPreferredDataSubscriptionId."
Brad Ebinger [Thu, 7 Mar 2019 22:27:19 +0000 (22:27 +0000)]
Merge "Fix NPE in SmsManager and keep existing behavior"
Brad Ebinger [Thu, 7 Mar 2019 21:14:18 +0000 (21:14 +0000)]
Merge "Add nullability annotations in accordance with the council"
Brad Ebinger [Thu, 7 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network"
Irina Dumitrescu [Fri, 8 Jun 2018 18:36:34 +0000 (19:36 +0100)]
Add Keystore get option that supresses caught exceptions warnings.
This is useful when the caught exceptions are not informative and they
act as a red herring in the adb logs.
Bug:
109791294
Test: call this method in the VpnSettings and manually navigate to
adding a new VPN by searching for VPN in settings and then pressing '+'.
Change-Id: I4bc86e3ea5b11027090fd3a27dc7455557cf66ab
Merged-In: I4bc86e3ea5b11027090fd3a27dc7455557cf66ab
OSDN Git Service
