Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,424 Commits 3 Branches 0 Tags
663ec79cb2aea77b4ed4eb19584177f5c699fc52
Commit Graph

280424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
663ec79cb2 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 
am: 76e6f790db

Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
 2017-02-14 06:21:44 +00:00
Erik Kline
76e6f790db Merge "Cleanup in the face of upstream error" 
am: ed6d75d5f3

Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
 2017-02-14 06:17:38 +00:00
Erik Kline
ed6d75d5f3 Merge "Cleanup in the face of upstream error" 2017-02-14 06:09:22 +00:00
Erik Kline
8ea45483fc Cleanup in the face of upstream error 
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.

Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
 2017-02-14 12:20:39 +09:00
Ningyuan Wang
9d1be09462 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 
am: 18b3a7f586

Change-Id: Iea1e8282f0a9d2b58d48ab67dd856fafce95daf0
 2017-02-14 02:24:30 +00:00
Ningyuan Wang
18b3a7f586 Merge "Create createFromByteArray() for WifiSsid" 
am: fb19d8d7c1

Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180
 2017-02-14 02:20:23 +00:00
Ningyuan Wang
fb19d8d7c1 Merge "Create createFromByteArray() for WifiSsid" 2017-02-14 02:13:34 +00:00
Chen Xu
60ca278b7f Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 
am: b206f5b382

Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
 2017-02-14 01:42:00 +00:00
Chen Xu
b206f5b382 Merge "Add simActivationState to PhoneStateListener" 
am: 132842efc9

Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a
 2017-02-14 01:34:02 +00:00
Chen Xu
132842efc9 Merge "Add simActivationState to PhoneStateListener" 2017-02-14 01:26:19 +00:00
Amith Yamasani
67dbaa8a14 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 
am: c510e19d18

Change-Id: I532b675a10ae9e21f28f3aa38d0f2e85ac080faa
 2017-02-14 01:02:54 +00:00
Amith Yamasani
c510e19d18 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev 
am: 7556690cf5

Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
 2017-02-14 00:57:56 +00:00
Michael Kwan
a26e371c9b Merge "Only modify window layout params when necessary." into cw-f-dev 
am: 9fbd981f23

Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
 2017-02-14 00:55:32 +00:00
TreeHugger Robot
7556690cf5 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev 2017-02-14 00:49:44 +00:00
Michael Kwan
9fbd981f23 Merge "Only modify window layout params when necessary." into cw-f-dev 2017-02-14 00:48:12 +00:00
Hakan Seyalioglu
aeb1f1241e DO NOT MERGE - Check exported status in chooser 
am: 7bae18232e

Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773
 2017-02-14 00:41:55 +00:00
Ningyuan Wang
a6ea570a4a Create createFromByteArray() for WifiSsid 
Bug: 35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
 2017-02-13 15:40:19 -08:00
Hakan Seyalioglu
7bae18232e DO NOT MERGE - Check exported status in chooser 
Relevant change in master is ag/1844170

bug: 34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit e3286c3145)
 2017-02-13 23:12:28 +00:00
Amith Yamasani
55100571da DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system." 
Reason: Breaking setting the user avatar in Settings.
Bug: 35158271
This reverts commit b61338ecb3.

Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
 2017-02-13 22:00:12 +00:00
Michael Kwan
134ad6ef3f Only modify window layout params when necessary. 
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.

Bug: 34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
 2017-02-13 13:20:09 -08:00
Peter Qiu
1b510ecff7 Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c 
am: 5644c190a0

Change-Id: Idac3a70dc9c8a10e82076014078d7b5af3acac72
 2017-02-13 20:07:16 +00:00
Peter Qiu
5644c190a0 Merge "hotspot2: fix typo in the getter functions" 
am: d3146f3c3c

Change-Id: I8fc4042c26f896d899c090dd7afbe16a44d431eb
 2017-02-13 20:02:06 +00:00
Treehugger Robot
d3146f3c3c Merge "hotspot2: fix typo in the getter functions" 2017-02-13 19:49:51 +00:00
Michael Kwan
2155f773db Add tweaks to smooth out swipe to dismiss. 
am: 5758a9a94c

Change-Id: I64b9e88a7efb164b0e0160f8b25f770fb986efd6
 2017-02-13 19:32:35 +00:00
Erik Kline
3de5971b40 Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 
am: 0cca15ff88

Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
 2017-02-13 12:02:48 +00:00
Erik Kline
0cca15ff88 Merge "Add test coverage for cleanup bug to be fixed." 
am: 89e6bf0532

Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
 2017-02-13 11:57:37 +00:00
Treehugger Robot
89e6bf0532 Merge "Add test coverage for cleanup bug to be fixed." 2017-02-13 11:51:21 +00:00
Erik Kline
a954be9563 Add test coverage for cleanup bug to be fixed. 
The test calls that need to pass but do not currently are commented out.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
 2017-02-13 17:38:34 +09:00
fionaxu
64eebba6bc Add simActivationState to PhoneStateListener 
- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
  activation state changed

Bug: 31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Merged-in: CHANGE-ID Ieefe2698fe6055a980d225f5ce74f52aef0daab4
Change-Id: Iac6418f66c9dad44dc7272ab19aa87f3eef232f8
 2017-02-13 00:26:35 -08:00
Michael Kwan
5758a9a94c Add tweaks to smooth out swipe to dismiss. 
Bug: 34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit 2e11adaac3)
 2017-02-13 06:17:06 +00:00
Jeff Sharkey
8100f549bf DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 
am: 62314d7dd3

Change-Id: Iba461adcfafc41128bc4cd33f934830c7a92ae65
 2017-02-12 10:26:57 +00:00
Jeff Sharkey
62314d7dd3 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc 
am: 55ef8ba763

Change-Id: Ie2f9e943501b62177b23b701a9eea219a1dc696f
 2017-02-12 10:22:43 +00:00
Jeff Sharkey
55ef8ba763 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a 
am: ab296986fc

Change-Id: Idd20eb270f3824840900b60a0b507b3c135ddc9e
 2017-02-12 10:18:15 +00:00
Jeff Sharkey
5b49be4488 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b 
am: 86f242b071

Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88
 2017-02-12 10:16:12 +00:00
Jeff Sharkey
ab296986fc DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours 
am: 9aca89293a

Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
 2017-02-12 10:14:09 +00:00
Jeff Sharkey
86f242b071 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 
am: c7b754f62b

Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
 2017-02-12 10:12:11 +00:00
Jeff Sharkey
9aca89293a DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 
am: 208dcadb4f  -s ours

Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
 2017-02-12 10:10:13 +00:00
Jeff Sharkey
c7b754f62b DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 
am: 853e178de4

Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
 2017-02-12 10:08:11 +00:00
Jeff Sharkey
208dcadb4f DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 
am: 9335807fc4

Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
 2017-02-12 10:06:34 +00:00
Jeff Sharkey
853e178de4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours 
am: deea677359

Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
 2017-02-12 10:04:10 +00:00
Jeff Sharkey
9335807fc4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a 
am: 00f5232dd0

Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
 2017-02-12 10:02:08 +00:00
Jeff Sharkey
deea677359 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 
am: 502ee22a9d  -s ours

Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
 2017-02-12 10:00:37 +00:00
Jeff Sharkey
00f5232dd0 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours 
am: 48f1ddc94a

Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
 2017-02-12 09:58:13 +00:00
Jeff Sharkey
502ee22a9d DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c 
am: 75f767afa1

Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
 2017-02-12 09:56:10 +00:00
Jeff Sharkey
48f1ddc94a DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 
am: a0b1198e70  -s ours

Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
 2017-02-12 09:53:38 +00:00
Jeff Sharkey
75f767afa1 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 
am: 32c71b078c

Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
 2017-02-12 09:51:37 +00:00
Jeff Sharkey
a0b1198e70 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 6f754e48e9

Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
 2017-02-12 09:48:46 +00:00
Jeff Sharkey
32c71b078c DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 3f3da42ef9

Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
 2017-02-12 09:47:33 +00:00
Paul Stewart
bdfb1b86d3 Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c 
am: 549c3fc0da

Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c
 2017-02-11 02:48:31 +00:00
Paul Stewart
549c3fc0da Merge "Allow EAP-SIM authentication methods under PEAP" 
am: e690e0178c

Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
 2017-02-11 02:43:38 +00:00