Jeff Sharkey
ea372362e6
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80
...
am: ede3a78432
Change-Id: Ia096688611ad3f30d7f32975a84ced573fa5961d
2016-12-02 02:17:17 +00:00
Jeff Sharkey
ede3a78432
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd
...
am: 6795459a80
Change-Id: I5ca304b89c30c3c7d0bddb701c60c81c87d8870c
2016-12-02 02:03:58 +00:00
Jeff Sharkey
6795459a80
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
...
am: 6eee8e37fd
Change-Id: I431b334bbf3580f51fc8e31da28c9c9d6f5944ee
2016-12-02 01:52:12 +00:00
Jeff Sharkey
6eee8e37fd
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
...
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266 )
2016-12-01 17:04:32 -07:00
Amin Shaikh
f9f477454e
Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 am: a8fc97d2de
...
am: d136025272
Change-Id: I2190eb09039d7abc51d4752c410d1d38e220564b
2016-12-01 02:26:50 +00:00
Amin Shaikh
d136025272
Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1
...
am: a8fc97d2de
Change-Id: I34ed2f31eaa1336990c941ee63eea0c1ddbc305c
2016-12-01 02:21:03 +00:00
Amin Shaikh
a8fc97d2de
Merge "Refactor NetworkScoreAppManager for testing."
...
am: 3af97482f1
Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
2016-12-01 02:10:55 +00:00
Mark Renouf
9a21708ec6
Allow power button to close an input method am: d28e907183
...
am: 8da4ced46c
Change-Id: Id6ab4bd72f1516f29900c12af31a097047e8b7fd
2016-12-01 01:34:33 +00:00
Mark Renouf
fed8c7dc73
Allow power button to close an input method
...
am: d28e907183
Change-Id: I26176ab20b90ca2c5d286b3f34bfacc6527018b5
2016-12-01 01:29:31 +00:00
Mark Renouf
8da4ced46c
Allow power button to close an input method
...
am: d28e907183
Change-Id: I0324d14bde85e3461d0fe605f3b83496b25b9c75
2016-12-01 01:29:11 +00:00
Mark Renouf
33d498b946
Merge "Allow power button to close an input method" into cw-f-dev
2016-12-01 01:16:59 +00:00
Stephen Chen
23ea4627d6
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." am: 6e54c31f0a am: 6ef2ec0d80
...
am: 6d7e85cb6b
Change-Id: Id5874da0cc2a36297c1e3578f8f62cc4a0026edf
2016-12-01 00:13:38 +00:00
Stephen Chen
6d7e85cb6b
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." am: 6e54c31f0a
...
am: 6ef2ec0d80
Change-Id: I2f36c6d7dc284605b490f9793f17d713bc622063
2016-12-01 00:09:17 +00:00
Stephen Chen
6ef2ec0d80
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
...
am: 6e54c31f0a
Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
2016-12-01 00:02:58 +00:00
vinodkrishnan
7e88808cd5
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" am: 7b62df8556
...
am: 60d4248fdc
Change-Id: Ia9d1ffc4b2d37b8a27173dccbb4e1cb518e8f712
2016-11-30 22:01:52 +00:00
Amin Shaikh
aa09aa0210
Refactor NetworkScoreAppManager for testing.
...
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
2016-11-30 13:52:43 -08:00
vinodkrishnan
afd52a7ad4
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
Change-Id: I7c8d922fb125bf786990642679ebdd17ba589a54
2016-11-30 21:52:13 +00:00
vinodkrishnan
60d4248fdc
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
am: 7b62df8556
Change-Id: Iec37684da3fa447d55498e6c8302fb229fa28373
2016-11-30 21:52:05 +00:00
TreeHugger Robot
a0d9383f71
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
2016-11-30 21:43:38 +00:00
Mark Renouf
d28e907183
Allow power button to close an input method
...
BUG: 33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
2016-11-30 16:01:42 -05:00
Treehugger Robot
6e54c31f0a
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
2016-11-30 20:25:13 +00:00
vinodkrishnan
7b62df8556
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
...
This reverts commit 8500f26d51 .
Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
2016-11-30 20:09:59 +00:00
Phil Weaver
84a0d97b85
Don't invalidate list data during layout.
...
am: a9d976f39a
Change-Id: I865fda193961bb0e5229cba1034b818572662001
2016-11-30 18:00:54 +00:00
Phil Weaver
d1b7d3262b
Merge "Don't invalidate list data during layout." into nyc-mr2-dev
2016-11-30 17:51:42 +00:00
Stephen Chen
767e453cdf
Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings.
...
Exposes an activity that deep links into saved network Settings.
Bug: 32738882
Test: gts test
Change-Id: Ic639b7543439bbe52941fa58a74a767a4a0f8a76
2016-11-28 16:26:16 -08:00
Hall Liu
a95fc5fea8
Merge "Add removeState method to StateMachine" am: 0310de1136 am: 01106c45ca
...
am: 1a8bdf8bf9
Change-Id: I54cbb26c9f68edb07aca4e8054750c665a33098f
2016-11-28 21:15:11 +00:00
Hall Liu
1a8bdf8bf9
Merge "Add removeState method to StateMachine" am: 0310de1136
...
am: 01106c45ca
Change-Id: I4f31491b1c9db29fe14222788d7fbd1fd6bce068
2016-11-28 21:06:44 +00:00
Hall Liu
01106c45ca
Merge "Add removeState method to StateMachine"
...
am: 0310de1136
Change-Id: Ib7d8e435c76bc7bcd83d6350c3c0622bb44d6552
2016-11-28 20:58:43 +00:00
Hall Liu
b222d2045d
Add removeState method to StateMachine
...
Method to be used by BluetoothRouteManager in Telecom.
Test: unit tests in Telecom
Change-Id: Icdd1a3d42224246a5f26100fabb26313ce83b14c
2016-11-23 11:52:58 -08:00
Baligh Uddin
39677cea6a
Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp
2016-11-23 17:56:36 +00:00
Jakub Pawlowski
0debe3c5b7
Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596
...
am: e8ceb15b51
Change-Id: I21eb000be58fd61b238e2401cf266b6f132acc83
2016-11-23 02:08:12 +00:00
Jakub Pawlowski
e8ceb15b51
Merge "Bluetooth: report proper advertiser status on error" am: b509957e62
...
am: 673c0e5596
Change-Id: Ic91b1c614e9cc71e7d57bd39ac31ec1127f08f65
2016-11-23 02:03:13 +00:00
Jakub Pawlowski
673c0e5596
Merge "Bluetooth: report proper advertiser status on error"
...
am: b509957e62
Change-Id: I1bb0a029a9044c3931e158c7ef02ffee4cb0f1cd
2016-11-23 01:58:03 +00:00
Baligh Uddin
b1df48d326
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
...
Bug: 32849428
* goog/cw-f-dev: (98 commits)
Revert "Catch KeyStoreException for setting profile lock"
Fix createConfirmDeviceCredentialIntent for wear for CTS.
Fix default dialog background colour for watch devices.
Catch KeyStoreException for setting profile lock
Add cross-links between FINE and COARSE location permissions. bug: 25371600
Fixed a bug with the emergency affordance in multi user
Zygote: Additional whitelists for runtime overlay / other static resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
colors: add missing accent_material_{700,50} resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
...
Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Jakub Pawlowski
76f517a173
Bluetooth: report proper advertiser status on error
...
When advertiser is not started because too many advertisers are
registered, return proper error code.
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef
2016-11-22 13:38:15 -08:00
Martijn Coenen
d42b1d01ca
Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb
...
am: 201cf4fb27
Change-Id: Ibd379f588dacbf571948d34d76abb0e6f12f3a79
2016-11-22 10:00:36 +00:00
Martijn Coenen
201cf4fb27
Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f
...
am: 8c05ff96fb
Change-Id: Ib406f48dc35ecededd89ed8ed8750622a26d9ee2
2016-11-22 09:55:03 +00:00
Martijn Coenen
8c05ff96fb
Merge "Add SystemProperties.reportSyspropChanged()."
...
am: 45c0c6939f
Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f
2016-11-22 09:49:15 +00:00
Treehugger Robot
45c0c6939f
Merge "Add SystemProperties.reportSyspropChanged()."
2016-11-22 09:43:23 +00:00
Jeff Sharkey
55727aaede
Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1
...
am: 3391f3376e
Change-Id: I942f9c44a8c3b1abf39694816a34790df3e224ad
2016-11-21 21:58:02 +00:00
Jeff Sharkey
3391f3376e
Merge "StrictMode to detect untagged network traffic." am: 67fe28d925
...
am: db5ed5beb1
Change-Id: Id6ce5cfedab250f25c0eb8b0c49971e9e20cbeb2
2016-11-21 21:48:31 +00:00
Jeff Sharkey
db5ed5beb1
Merge "StrictMode to detect untagged network traffic."
...
am: 67fe28d925
Change-Id: I52cdce87d87ec503294e431c8f22e87235bdbf79
2016-11-21 21:43:58 +00:00
Treehugger Robot
67fe28d925
Merge "StrictMode to detect untagged network traffic."
2016-11-21 21:33:15 +00:00
Jeff Sharkey
8984897502
Merge "Stub Binder API." am: 4db1632b3a am: 313456c975
...
am: c61a8e01a3
Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690
2016-11-21 20:31:28 +00:00
Jeff Sharkey
c61a8e01a3
Merge "Stub Binder API." am: 4db1632b3a
...
am: 313456c975
Change-Id: Icc2db98a8ab325ca4bc7456abe5963c293a878cb
2016-11-21 20:26:22 +00:00
Jeff Sharkey
313456c975
Merge "Stub Binder API."
...
am: 4db1632b3a
Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2
2016-11-21 20:21:25 +00:00
Jeff Sharkey
4db1632b3a
Merge "Stub Binder API."
2016-11-21 20:10:29 +00:00
Jeff Sharkey
763a140796
StrictMode to detect untagged network traffic.
...
Define some constants for early use in AOSP code.
Test: builds, boots, all common traffic tagged
Bug: 30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
2016-11-21 12:15:16 -07:00
Nancy Zheng
2a12d8520e
Fix createConfirmDeviceCredentialIntent for wear for CTS. am: 43f166dfb4
...
am: a2193c0b76
Change-Id: I9f216231ff600972e3ddec195158fc2489693a1e
2016-11-21 18:25:12 +00:00
Nancy Zheng
a2193c0b76
Fix createConfirmDeviceCredentialIntent for wear for CTS.
...
am: 43f166dfb4
Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
2016-11-21 18:19:48 +00:00