Commit Graph

68286 Commits

Author SHA1 Message Date
Stephen Chen
a4d7d45df9 Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586
am: d738140b8d

Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0
2016-12-03 04:23:49 +00:00
Stephen Chen
d738140b8d Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
2016-12-03 04:16:06 +00:00
Treehugger Robot
d758ce1586 Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." 2016-12-02 23:41:36 +00:00
Jeff Sharkey
37d3eecbac DO NOT MERGE: Check provider access for content changes. am: c813f5dae2
am: 2b7584f5b1

Change-Id: I1a74f306a4d9858a4e9726cd53ab544d28542522
2016-12-02 18:36:36 +00:00
Jeff Sharkey
2b7584f5b1 DO NOT MERGE: Check provider access for content changes.
am: c813f5dae2

Change-Id: I939bca8887198e2578916356d49b0f2f0a2bf3d2
2016-12-02 18:19:46 +00:00
Robert Sesek
5806963539 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f
am: bbcd9d26b1

Change-Id: I7b7fbf2cc65712bd748a577c2eee1c0a1e35efee
2016-12-02 17:21:27 +00:00
Robert Sesek
bbcd9d26b1 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am: eda1af611f

Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
2016-12-02 17:15:23 +00:00
Treehugger Robot
eda1af611f Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." 2016-12-02 17:02:31 +00:00
Jeff Sharkey
6dbcefeea6 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd
am: 6795459a80

Change-Id: I2ca4cd7315a5e22c0bc53519b3705248ebf924ed
2016-12-02 02:04:40 +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
ltrochtova
8874fcf97f Revert "Introduce a new user restriction for disallowing Bluetooth."
This reverts commit 69f9d321ac.

Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
2016-12-01 20:50:53 +00:00
Lenka Trochtova
69f9d321ac Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the  entire device - i.e. in all the users.

Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
2016-12-01 10:56:51 +01:00
Stephen Chen
8ca96c1f3c Add Settings.Global.WIFI_WAKEUP_ENABLED flag.
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#

Bug: 32920000
Bug: 32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
2016-11-30 18:31:44 -08: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
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
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
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
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
Robert Sesek
c5f86647b1 Add new hostingType for startProcessLocked() that selects using the WebViewZygote.
Test: m
Test: angler boots
Test: Turn on Multiprocess WebView in Developer Options and launch the WebView
      Shell. The sandboxed_service parent process is the webview_zygote.

Bug: 21643067
Change-Id: I9dab548853372fd91f6bbe204cc8686ef2e94448
2016-11-29 11:08:49 -05: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
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
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
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
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
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
Jeff Sharkey
1324531355 Stub Binder API.
Provide a stub API for AOSP code to call.

Test: builds
Bug: 32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
2016-11-21 18:11:25 +00:00
Martijn Coenen
0754b27b56 Add SystemProperties.reportSyspropChanged().
To support notifying libutils of system property
changes.

Bug: 31262344
Test: builds
Change-Id: Iea77532eaa84d00f7d640edd1e3a1da66afdadc5
2016-11-21 17:57:13 +00:00
Torne (Richard Coles)
9565860b08 Merge "Precreate the classloader for the WebView." am: 566b1c80e4
am: 1feb782f01

Change-Id: Iec0bf848e4c25afc6a6b9ee83339a03f314adee9
2016-11-21 17:08:46 +00:00
Torne (Richard Coles)
1feb782f01 Merge "Precreate the classloader for the WebView."
am: 566b1c80e4

Change-Id: Ic79079748dae515cb8d89ef99148755ac65f1d47
2016-11-21 17:04:22 +00:00