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

384411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Android Build Merger (Role)
75b9b48cec Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5" into stage-aosp-master 2019-03-07 19:19:39 +00:00
Andrei-Valentin Onea
9c1d2a5b66 Merge "Add @UnsupportedAppUsage annotations" 
am: 315404a9a5

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

Change-Id: I281b0d628f1201e88d4c7c3a764f5a55392dadaa
 2019-03-07 11:10:22 -08:00
Bill Yi
35723fb2b1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I32003be7ab473918497b871a6b34f229f01ae5b2
 2019-03-07 10:24:56 -08: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
04e04516b4 Merge "Add target for generating aidl mappings" 2019-03-07 16:31:14 +00:00
Andrei-Valentin Onea
315404a9a5 Merge "Add @UnsupportedAppUsage annotations" 2019-03-07 16:30:32 +00:00
Leo Hsu
751020501f Merge "Exclude Emergency Dialer from recent app list." am: 108b8d6e40 
am: 6817b6031e

Change-Id: I9fbf25cb61f77728db359f1c77c2ed91ea5ba1dd
 2019-03-07 06:07:16 -08:00
Leo Hsu
6817b6031e Merge "Exclude Emergency Dialer from recent app list." 
am: 108b8d6e40

Change-Id: I2c91bdea23f77be5e0e7e09d6b7c888bc1755e46
 2019-03-07 05:56:52 -08:00
Treehugger Robot
108b8d6e40 Merge "Exclude Emergency Dialer from recent app list." 2019-03-07 13:43:36 +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
Leo Hsu
90e276e997 Exclude Emergency Dialer from recent app list. 
Emergency Dialer should not show up in recent app list.

Bug: 112168722
Bug: 127585929
Test: Long press power key, tap Emergency, quit Emergency Dialer, and
check recent app list.
Change-Id: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Merged-In: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
 2019-03-07 19:09:08 +08: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
Chad Brubaker
b1bb0bf0a1 Merge "Do not call noteOp if checkPermission fails" am: bc9b1b6f94 
am: e23da7135a

Change-Id: I3b7c6c45ad7b209b9a96008b593a13d59cf36783
 2019-03-07 01:20:21 -08:00
Chad Brubaker
e23da7135a Merge "Do not call noteOp if checkPermission fails" 
am: bc9b1b6f94

Change-Id: I53347c7a897b079268d9c8af704664a832eae581
 2019-03-07 01:10:53 -08:00
Treehugger Robot
bc9b1b6f94 Merge "Do not call noteOp if checkPermission fails" 2019-03-07 08:56:39 +00:00
Varun Anand
6a050c7c50 Revert "Update VPN capabilities when its underlying network set is null." 
This reverts commit ad8805a6c2.

Bug: 126245192

Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.

Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.

Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
 2019-03-07 06:13:03 +00:00
Brett Chabot
1e33868f0b Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 58038da960 
am: dc1077d5db

Change-Id: I88b55d65728e366e2ffd1336e28da4a879b2d5a2
 2019-03-06 22:01:10 -08:00
Brett Chabot
dc1077d5db Merge "Migrate frameworks/base/tests/net/ to androidx.test" 
am: 58038da960

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
 2019-03-06 21:51:50 -08:00
Treehugger Robot
58038da960 Merge "Migrate frameworks/base/tests/net/ to androidx.test" 2019-03-07 05:42:07 +00:00
markchien
9554abf9ed Fix TetheringEntitlementValueListener related API 
Test: -build, flash, boot
      -atest FrameworksNetTests
bug: 126701557
bug: 126392011

Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
 2019-03-07 13:33:21 +08:00
Remi NGUYEN VAN
4adf7d6a17 Merge "Fix SocketUtils API" am: 3da7809ae4 
am: f0ef74dc7a

Change-Id: If460832503e71fccf41494e99ea78d1b85a50ef6
 2019-03-06 20:22:36 -08:00
Remi NGUYEN VAN
f0ef74dc7a Merge "Fix SocketUtils API" 
am: 3da7809ae4

Change-Id: I03e0eb60d71cba27e57f8ee7832269bbd75f5344
 2019-03-06 20:13:28 -08:00
Remi NGUYEN VAN
3da7809ae4 Merge "Fix SocketUtils API" 2019-03-07 03:54:22 +00:00