Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
345,105 Commits 3 Branches 0 Tags
d19ef3fa1bfbd89cf494002de98a672448ee98ab
Commit Graph

345105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Holly Jiuyu Sun
d19ef3fa1b Merge "Fill in methods in EuiccCardController." am: 197f072da2 
am: d143bb628a

Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
 2018-01-25 22:06:08 +00:00
Android Build Merger (Role)
06e56a4086 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev am: 41ae4b7eae am: 6c1ecb973c 
am: 876a1f75a3

Change-Id: I0310d50282b343261575d20cda3536667c8478b9
 2018-01-25 21:56:08 +00:00
Android Build Merger (Role)
ed4ea1e66a [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 am: 77243e2d28 -s ours am: 114cd10ac9 -s ours 
am: 78578a1294  -s ours

Change-Id: I39d1e16f34fea09009c039a955040e811988d422
 2018-01-25 21:50:53 +00:00
Holly Jiuyu Sun
d143bb628a Merge "Fill in methods in EuiccCardController." 
am: 197f072da2

Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e
 2018-01-25 21:47:46 +00:00
Android Build Merger (Role)
876a1f75a3 Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev am: 41ae4b7eae 
am: 6c1ecb973c

Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
 2018-01-25 19:25:06 +00:00
Android Build Merger (Role)
d68ab1fd08 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 am: 19f08130b1 -s ours am: fa70de88c5 -s ours 
am: b8bc53ecc3  -s ours

Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b
 2018-01-25 19:23:56 +00:00
Android Build Merger (Role)
78578a1294 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 am: 77243e2d28 -s ours 
am: 114cd10ac9  -s ours

Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f
 2018-01-25 19:21:27 +00:00
Android Build Merger (Role)
b8bc53ecc3 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 am: 19f08130b1 -s ours 
am: fa70de88c5  -s ours

Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6
 2018-01-25 19:14:57 +00:00
Android Build Merger (Role)
6c1ecb973c Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev 
am: 41ae4b7eae

Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef
 2018-01-25 19:09:52 +00:00
Android Build Merger (Role)
114cd10ac9 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 
am: 77243e2d28  -s ours

Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd
 2018-01-25 19:09:05 +00:00
Android Build Merger (Role)
fa70de88c5 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 
am: 19f08130b1  -s ours

Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c
 2018-01-25 19:04:31 +00:00
TreeHugger Robot
41ae4b7eae Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev 
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE
 2018-01-25 18:40:29 +00:00
Holly Jiuyu Sun
197f072da2 Merge "Fill in methods in EuiccCardController." 2018-01-25 17:22:50 +00:00
Andreas Gampe
b328fbc6b8 Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d 
am: 57f653a155

Change-Id: I03dee58beeb6247a7786fef455eae646fb243121
 2018-01-25 16:10:00 +00:00
Andreas Gampe
57f653a155 Merge "PrintSpooler: Fix EqualsNaN in test" 
am: ffcf3ff77d

Change-Id: I4c803259d993c51790c4b960251dde3a2bea9db9
 2018-01-25 15:53:05 +00:00
Eric Schwarzenbach
55373d0549 Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 
am: 4dac182030

Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
 2018-01-25 15:49:59 +00:00
David Brazdil
a5cc0bb027 Merge "Create hidden API lists" am: b6a5c92b50 
am: 265863f9d9

Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048
 2018-01-25 15:33:47 +00:00
Eric Schwarzenbach
a0414ed567 Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1 
am: d529242eea

Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
 2018-01-25 15:23:48 +00:00
Eric Schwarzenbach
4dac182030 Merge "Update CellInfo API to accomodate new fields." 
am: 7e73c73f89

Change-Id: Ib82c77d3b5559d593dbb3181add634eee251f53b
 2018-01-25 15:23:20 +00:00
Malcolm Chen
6ec70f018e Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 
am: 9348e258cd

Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
 2018-01-25 15:19:06 +00:00
David Brazdil
265863f9d9 Merge "Create hidden API lists" 
am: b6a5c92b50

Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
 2018-01-25 15:14:58 +00:00
Eric Schwarzenbach
d529242eea Merge "Add ServiceState APIs for carrier aggregation." 
am: 185a89caf1

Change-Id: I15e52f02c204805efacbd22eaad9a1e7218ff3ca
 2018-01-25 15:09:59 +00:00
Malcolm Chen
9348e258cd Merge "Add slotId in INetworkService.aidl methods." 
am: b1c6aa4567

Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202
 2018-01-25 15:06:59 +00:00
Treehugger Robot
ffcf3ff77d Merge "PrintSpooler: Fix EqualsNaN in test" 2018-01-25 15:05:27 +00:00
Android Build Merger (Role)
77243e2d28 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 
Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403
 2018-01-25 14:23:13 +00:00
Android Build Merger (Role)
10f8c984c0 [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb 
Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498
 2018-01-25 14:23:07 +00:00
Bill Yi
9a738cccdb Import translations. DO NOT MERGE 
Change-Id: Ie4fc80ab24fb6a8f3272a6540e6d93d26b7d5496
Auto-generated-cl: translation import
 2018-01-25 06:22:37 -08:00
Treehugger Robot
7e73c73f89 Merge "Update CellInfo API to accomodate new fields." 2018-01-25 12:50:37 +00:00
Android Build Merger (Role)
19f08130b1 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 
Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c
 2018-01-25 12:17:01 +00:00
Android Build Merger (Role)
a14fb25f93 [automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 
Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99
 2018-01-25 12:16:54 +00:00
Bill Yi
e34cac0486 Import translations. DO NOT MERGE 
Change-Id: I3040ff1778e9dc85cc004396ec70bf272d73c0f5
Auto-generated-cl: translation import
 2018-01-25 04:16:22 -08:00
David Brazdil
b6a5c92b50 Merge "Create hidden API lists" 2018-01-25 07:55:35 +00:00
nharold
461aeb4689 Merge "Move Keepalive out of IpSecTransform.Builder" am: af3fb3efe4 
am: bbb4b05a64

Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5
 2018-01-25 07:49:59 +00:00
Treehugger Robot
185a89caf1 Merge "Add ServiceState APIs for carrier aggregation." 2018-01-25 07:47:55 +00:00
Chalard Jean
16897eb4aa Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: a8452ed2a6 
am: 806f0191d4

Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
 2018-01-25 07:41:44 +00:00
nharold
bbb4b05a64 Merge "Move Keepalive out of IpSecTransform.Builder" 
am: af3fb3efe4

Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604
 2018-01-25 07:37:00 +00:00
Chalard Jean
806f0191d4 Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" 
am: a8452ed2a6

Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
 2018-01-25 07:33:35 +00:00
Eric Schwarzenbach
a9d9b021be Update CellInfo API to accomodate new fields. 
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
 2018-01-25 07:25:04 +00:00
Treehugger Robot
b1c6aa4567 Merge "Add slotId in INetworkService.aidl methods." 2018-01-25 07:13:17 +00:00
nharold
af3fb3efe4 Merge "Move Keepalive out of IpSecTransform.Builder" 2018-01-25 05:50:33 +00:00
Chalard Jean
a8452ed2a6 Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" 2018-01-25 05:37:21 +00:00
Andreas Gampe
c899ee547c PrintSpooler: Fix EqualsNaN in test 
Fix NaN comparisons in WorkflowTest.

Bug: 72451126
Test: m javac-check RUN_ERROR_PRONE=true
Merged-In: I3eba48ac3f8dc343cd22cac0f9fbf4d4e6c76631
Change-Id: I19db273ee442c912c2c1052d53b5b2e0c5cd968b
 2018-01-24 21:19:30 -08:00
Chalard Jean
cf8c3fe19c Fix a bug where a NetworkAgent gets repeatedly torn down 
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.

Bug: 72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
      and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942
 2018-01-25 04:51:44 +00:00
Jeremy Klein
2eee5f20f0 Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." am: f4dc715575 
am: 4c2c7bedf9

Change-Id: I5d214df392ed17c7de0456f535f9b550485c8fc2
 2018-01-25 03:44:46 +00:00
Jeremy Klein
4c2c7bedf9 Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." 
am: f4dc715575

Change-Id: I1f603f966aeb5d828746969295f51e2f01096bc4
 2018-01-25 03:35:06 +00:00
Jun Yin
76e05493b4 Merge "Adds stripTrailingFs" am: 27bb333e14 
am: a91491a3b8

Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef
 2018-01-25 03:34:13 +00:00
Nathan Harold
c43e89f973 Move Keepalive out of IpSecTransform.Builder 
The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.

Bug: 38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041
 2018-01-24 19:32:04 -08:00
Jun Yin
a91491a3b8 Merge "Adds stripTrailingFs" 
am: 27bb333e14

Change-Id: I355be2bb0b23e69103edc073ffe3adb757e57aa9
 2018-01-25 03:27:05 +00:00
Treehugger Robot
f4dc715575 Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." 2018-01-25 03:09:27 +00:00
Amit Mahajan
fd8df8236f Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65 
am: e2075c2c7d

Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
 2018-01-25 02:59:04 +00:00