OSDN Git Service
Hall Liu [Thu, 16 Feb 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
am:
4d3435637f -s ours
Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16
Chris Tate [Thu, 16 Feb 2017 01:25:04 +0000 (01:25 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
am:
38f1b6dbc9
Change-Id: I44d16150abee9dd0ec7961d1ce847d9793937354
Hall Liu [Thu, 16 Feb 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
Chris Tate [Thu, 16 Feb 2017 00:50:56 +0000 (00:50 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hall Liu [Wed, 15 Feb 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56 am:
2bc24e252e
am:
38f5001c10
Change-Id: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Hall Liu [Wed, 15 Feb 2017 22:30:44 +0000 (22:30 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56
am:
2bc24e252e
Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8
Hall Liu [Wed, 15 Feb 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
am:
decc6c9d56
Change-Id: I58a70b265f4b5af735e93c9004616bd44d5c51de
Hall Liu [Wed, 15 Feb 2017 21:41:21 +0000 (21:41 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:27:18 +0000 (20:27 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180 am:
0a3efc2622
am:
d4a847495e
Change-Id: Icadc77cb7630e61166ab3c9608f60736c24e52c1
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:20:15 +0000 (20:20 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180
am:
0a3efc2622
Change-Id: I2c0ba36c46674ff7f9a0b963543e271eec93858c
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:13:53 +0000 (20:13 +0000)]
Merge changes from topic 'dual_role_chargers'
am:
37b939a180
Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:00:24 +0000 (20:00 +0000)]
Merge changes from topic 'dual_role_chargers'
* changes:
Introduce debounce to filter rapidly toggling type-c ports
Fix handling usb dialog for wall chargers.
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers.
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hugo Benichi [Wed, 15 Feb 2017 01:24:29 +0000 (01:24 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab am:
ab453cd565
am:
7c9cc1f9e5
Change-Id: I6f487ce9da656610c939ddc78e834ac8ef5f8135
Hugo Benichi [Wed, 15 Feb 2017 01:09:58 +0000 (01:09 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab
am:
ab453cd565
Change-Id: I72e114037ce6a0ec53863749b8ffa34513c9fdce
Hugo Benichi [Wed, 15 Feb 2017 01:05:24 +0000 (01:05 +0000)]
Merge "ConnectivityManager: fix potential NPE"
am:
b688dd18ab
Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e
Erik Kline [Wed, 15 Feb 2017 01:04:44 +0000 (01:04 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83 am:
f6d55d7e9e
am:
8eb1fbf1bc
Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f
Erik Kline [Wed, 15 Feb 2017 01:03:49 +0000 (01:03 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6 am:
4650762557
am:
23d077318c
Change-Id: I19f92ac6160702233832a190aeeaeff06391ce9e
Erik Kline [Wed, 15 Feb 2017 00:54:07 +0000 (00:54 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83
am:
f6d55d7e9e
Change-Id: Ibd6b1fae52ec31ae488484be727b5261820e6ecb
Hugo Benichi [Wed, 15 Feb 2017 00:53:44 +0000 (00:53 +0000)]
Merge "ConnectivityManager: fix potential NPE"
Erik Kline [Wed, 15 Feb 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6
am:
4650762557
Change-Id: Ie004da6fe1252ddec90204637ff17c3ed73f2923
Erik Kline [Wed, 15 Feb 2017 00:49:20 +0000 (00:49 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
am:
7a42d3ad83
Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642
Erik Kline [Wed, 15 Feb 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
am:
63445824d6
Change-Id: Ie921ee1a2f1dbdd338c9f0700b24808e1cb6435e
Erik Kline [Wed, 15 Feb 2017 00:38:50 +0000 (00:38 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
Erik Kline [Wed, 15 Feb 2017 00:38:31 +0000 (00:38 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
Michael Peck [Wed, 15 Feb 2017 00:00:11 +0000 (00:00 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling" am:
4516240b47 am:
f8cefed995
am:
5493749d64
Change-Id: I731220c719cf29d94e11698906dfb7f049a90a55
Michael Peck [Tue, 14 Feb 2017 23:55:07 +0000 (23:55 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling" am:
4516240b47
am:
f8cefed995
Change-Id: Ie71368e7b4571d209d8c3a824bbf1a8c738f56a8
Michael Peck [Tue, 14 Feb 2017 23:50:17 +0000 (23:50 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
am:
4516240b47
Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09
Treehugger Robot [Tue, 14 Feb 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
Michael Kwan [Tue, 14 Feb 2017 23:00:47 +0000 (23:00 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev am:
c61cd1a635
am:
34c98becbd
Change-Id: I4030b021838853ca3064d9da01a7d89a64d1861c
Michael Kwan [Tue, 14 Feb 2017 22:57:48 +0000 (22:57 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev am:
c61cd1a635
am:
83b072c48c
Change-Id: I77b0a0a30e60658dbcf3ab0806bd0227939b8ba8
Michael Kwan [Tue, 14 Feb 2017 22:53:44 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: I02c70d3be50c00927e78282c9f3635b7ed9ae197
Michael Kwan [Tue, 14 Feb 2017 22:53:41 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
TreeHugger Robot [Tue, 14 Feb 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
Michael Kwan [Tue, 14 Feb 2017 20:04:38 +0000 (12:04 -0800)]
Fix incorrect values for VelocityTracker in SwipeDismissLayout.
The offset used to adjust MotionEvents for swipe velocity tracking
was incorrect, and caused issues when touch points where close
together. Fixed the offset used, which resolved swiping issues.
Bug:
34673753
Change-Id: Ide6060b511510bcf299e3db778e6ffc6afda5e19
Colin Cross [Tue, 14 Feb 2017 19:22:27 +0000 (19:22 +0000)]
Merge "Use asm-5.2 prebuilt" am:
6b32770d6d am:
6c1ac4dd80
am:
29fd14f9ee
Change-Id: I0b08a521058a82ca801f020bd63dc9ccb4bf3a28
Colin Cross [Tue, 14 Feb 2017 19:17:24 +0000 (19:17 +0000)]
Merge "Use asm-5.2 prebuilt" am:
6b32770d6d
am:
6c1ac4dd80
Change-Id: Icc01bcd92c5b23198bb39ff382610c72b4bf1867
Colin Cross [Tue, 14 Feb 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Use asm-5.2 prebuilt"
am:
6b32770d6d
Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c
Colin Cross [Tue, 14 Feb 2017 19:03:45 +0000 (19:03 +0000)]
Merge "Use asm-5.2 prebuilt"
Philip P. Moltmann [Tue, 14 Feb 2017 17:43:23 +0000 (09:43 -0800)]
resolve merge conflicts of
d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev-plus-aosp
Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382
Michael Peck [Tue, 14 Feb 2017 17:07:04 +0000 (09:07 -0800)]
Pass targetSdkVersion specifier for SELinux labeling
Motivation:
Provide the ability to phase in new security policies by
applying them to apps with a minimum targetSdkVersion
Test: Marlin builds and boots. Apps targeting targetSdkVersion<=25
run in untrusted_app_25 domain. Apps targeting the current development
build >=26 run in the untrusted_app domain with fewer permissions. No
new denials observed during testing.
Bug:
34115651
Change-Id: Ib9f6ded9bd2f426861a6d843861b4074084253b0
Orion Hodson [Tue, 14 Feb 2017 16:20:31 +0000 (16:20 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b am:
49e0cad3e1
am:
4105747ec3
Change-Id: Id6a920af9c5f506d4e25cb05294877f9a7043aaa
Orion Hodson [Tue, 14 Feb 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b
am:
49e0cad3e1
Change-Id: I16775763cb63e18d35765b807acb91fc57286b85
Orion Hodson [Tue, 14 Feb 2017 16:07:28 +0000 (16:07 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
am:
3023906b1b
Change-Id: If332034df3b7afac1f7fdb92ca40adfb420ba768
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev
Orion Hodson [Tue, 14 Feb 2017 16:02:32 +0000 (16:02 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
Manu Cornet [Tue, 14 Feb 2017 15:30:21 +0000 (15:30 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
am:
f47658f120
Change-Id: I664be0dd3e1f2e6cf2d7dc94613b0efcaf6887a9
TreeHugger Robot [Tue, 14 Feb 2017 15:24:42 +0000 (15:24 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
songjinshi [Tue, 14 Feb 2017 14:39:14 +0000 (14:39 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18 am:
f69a73793d
am:
d0e81464bd
Change-Id: I8a2f552e3fa500f14e1912acbbbade3ea510715f
songjinshi [Tue, 14 Feb 2017 14:34:13 +0000 (14:34 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18
am:
f69a73793d
Change-Id: Ifcce0699f9434cf490f9b4b596ba7604208275c6
songjinshi [Tue, 14 Feb 2017 14:29:36 +0000 (14:29 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am:
d530d1bf18
Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
Treehugger Robot [Tue, 14 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
Erik Kline [Tue, 14 Feb 2017 10:03:09 +0000 (19:03 +0900)]
Split chooseUpstreamType() into two separate functions
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: If892864ff59a6f38340791597c2d9e5b4022bbfa
Erik Kline [Tue, 14 Feb 2017 09:26:04 +0000 (18:26 +0900)]
Slightly simplify mTryCell and requestUpstreamMobileConnection() usage
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I46fbd176a71e61552d7d92660c1debe6487a1edf
Erik Kline [Tue, 14 Feb 2017 09:49:56 +0000 (09:49 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc am:
02e71f6245
am:
8055dafb08
Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
Erik Kline [Tue, 14 Feb 2017 09:45:56 +0000 (09:45 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc
am:
02e71f6245
Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
Erik Kline [Tue, 14 Feb 2017 09:41:53 +0000 (09:41 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
am:
3d57eb0bdc
Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
Treehugger Robot [Tue, 14 Feb 2017 09:32:55 +0000 (09:32 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
Hugo Benichi [Fri, 3 Feb 2017 05:18:44 +0000 (14:18 +0900)]
ConnectivityManager: fix potential NPE
ConnectivityManager static sCallbackHandler is referenced and directly
used in a way that is not ensuring its proper initialization.
This patch fixes this potential NPE by using getHandler() instead.
Also this patch changes sendRequestForNetwork's signature to only accept
the subtype CallbackHandler instead of Handler: without using
CallbackHandler the NetworkCallbacks are not triggered properly and
bookkeeping of sCallbacks does not happen. sendRequestForNetwork's
signature now makes this explicit.
This step prepares the addition of overloaded versions of
registerNetworkCallback and cie that takes custom Handlers.
Test: build, flashed, manually checked connectivity
Change-Id: I52e8a2cb5075e7aef7b35e30c9845cacba927d13
Erik Kline [Tue, 14 Feb 2017 06:55:00 +0000 (15:55 +0900)]
Verify duplicate upstream notifications are ignored
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32163131
Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
Erik Kline [Tue, 14 Feb 2017 06:25:47 +0000 (06:25 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3 am:
76e6f790db
am:
663ec79cb2
Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
Erik Kline [Tue, 14 Feb 2017 06:21:44 +0000 (06:21 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3
am:
76e6f790db
Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
Erik Kline [Tue, 14 Feb 2017 06:17:38 +0000 (06:17 +0000)]
Merge "Cleanup in the face of upstream error"
am:
ed6d75d5f3
Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
Erik Kline [Tue, 14 Feb 2017 06:09:21 +0000 (06:09 +0000)]
Merge "Cleanup in the face of upstream error"
Badhri Jagan Sridharan [Tue, 14 Feb 2017 03:40:33 +0000 (03:40 +0000)]
Merge changes from topic 'pixel-c' into nyc-mr2-dev
am:
dee514fae3
Change-Id: I4038d1fbd429fcedc4a379d764b5ef5c59dcce1d
TreeHugger Robot [Tue, 14 Feb 2017 03:34:48 +0000 (03:34 +0000)]
Merge changes from topic 'pixel-c' into nyc-mr2-dev
* changes:
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
Erik Kline [Mon, 13 Feb 2017 08:28:53 +0000 (17:28 +0900)]
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
Ningyuan Wang [Tue, 14 Feb 2017 02:28:30 +0000 (02:28 +0000)]
Merge "Create createFromByteArray() for WifiSsid" am:
fb19d8d7c1 am:
18b3a7f586
am:
9d1be09462
Change-Id: If221ae36424377501677f70a3601509328268604
Ningyuan Wang [Tue, 14 Feb 2017 02:24:30 +0000 (02:24 +0000)]
Merge "Create createFromByteArray() for WifiSsid" am:
fb19d8d7c1
am:
18b3a7f586
Change-Id: Iea1e8282f0a9d2b58d48ab67dd856fafce95daf0
Ningyuan Wang [Tue, 14 Feb 2017 02:20:23 +0000 (02:20 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
am:
fb19d8d7c1
Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180
Ningyuan Wang [Tue, 14 Feb 2017 02:13:33 +0000 (02:13 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
Chen Xu [Tue, 14 Feb 2017 01:46:33 +0000 (01:46 +0000)]
Merge "Add simActivationState to PhoneStateListener" am:
132842efc9 am:
b206f5b382
am:
60ca278b7f
Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Chen Xu [Tue, 14 Feb 2017 01:42:00 +0000 (01:42 +0000)]
Merge "Add simActivationState to PhoneStateListener" am:
132842efc9
am:
b206f5b382
Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
Chen Xu [Tue, 14 Feb 2017 01:34:02 +0000 (01:34 +0000)]
Merge "Add simActivationState to PhoneStateListener"
am:
132842efc9
Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a
Chen Xu [Tue, 14 Feb 2017 01:26:18 +0000 (01:26 +0000)]
Merge "Add simActivationState to PhoneStateListener"
Android Build Merger (Role) [Tue, 14 Feb 2017 01:10:21 +0000 (01:10 +0000)]
Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18 am:
ee37330dff" into nyc-mr2-dev-plus-aosp
Amith Yamasani [Tue, 14 Feb 2017 01:09:39 +0000 (01:09 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18
am:
ee37330dff
Change-Id: I9f75a9309a91de3a6145861189534c8ab10ca6f3
Amith Yamasani [Tue, 14 Feb 2017 01:07:53 +0000 (01:07 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18
am:
67dbaa8a14
Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846
Amith Yamasani [Tue, 14 Feb 2017 01:02:54 +0000 (01:02 +0000)]
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
Amith Yamasani [Tue, 14 Feb 2017 01:02:53 +0000 (01:02 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5
am:
c510e19d18
Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
Android Build Merger (Role) [Tue, 14 Feb 2017 01:01:10 +0000 (01:01 +0000)]
Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23 am:
d56887f8fa" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 01:00:27 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
d56887f8fa
Change-Id: I6e3695c245ed6afb208c0bd422b0ed2ac840281f
Michael Kwan [Tue, 14 Feb 2017 01:00:23 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
a26e371c9b
Change-Id: I72bf9b5fa5dfaaa7573115ed5b6cca23a0be05f4
Amith Yamasani [Tue, 14 Feb 2017 00:57:56 +0000 (00:57 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am:
7556690cf5
Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
Michael Kwan [Tue, 14 Feb 2017 00:55:32 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
Michael Kwan [Tue, 14 Feb 2017 00:55:29 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
TreeHugger Robot [Tue, 14 Feb 2017 00:49:41 +0000 (00:49 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Feb 2017 00:48:16 +0000 (00:48 +0000)]
Merge "DO NOT MERGE - Check exported status in chooser am:
7bae18232e am:
45fa749c5a" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 00:48:10 +0000 (00:48 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:27 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
45fa749c5a
Change-Id: Ie308e49d410863c643c13256076a3ed83c934adc
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:25 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
aeb1f1241e
Change-Id: Ibdc23df2da0b8ea387f54169224e467a37466cff
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:55 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:51 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
Philip P. Moltmann [Mon, 13 Feb 2017 20:59:21 +0000 (20:59 +0000)]
[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"
This reverts commit
2fc44947dd4f45a23c56985d4c12f01332027a9f.
Bug:
30662828
Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
Ningyuan Wang [Mon, 13 Feb 2017 19:26:15 +0000 (11:26 -0800)]
Create createFromByteArray() for WifiSsid
Bug:
35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111