Commit Graph

62248 Commits

Author SHA1 Message Date
Stephen Chen
70889ff69f Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993
2016-12-06 19:34:46 +00:00
Stephen Chen
e70ef235fb Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db
am: 45fdf32038

Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e
2016-12-06 19:27:45 +00:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
2016-12-06 19:20:24 +00:00
Ned Burns
768f62aac1 Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
am: f9566827f2

Change-Id: I157e10afa6b8c0414c2af25d98bf5913928925f2
2016-12-06 02:38:47 +00:00
Ned Burns
081fd25237 Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: Ie9784fa9b7c878371f1e12acbb362b36fc66e023
2016-12-06 02:33:23 +00:00
Ned Burns
f9566827f2 Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: I17d086e1c24d9eb91a984c45b88f529006465d34
2016-12-06 02:33:13 +00:00
Alan Viverette
09ce7433e9 Show popup transitions when there is no anchor set
am: 61edf5bbff

Change-Id: If658b86996fbaff411d7c487f913368715026935
2016-12-06 01:07:43 +00:00
Alan Viverette
6ad979a637 Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev 2016-12-06 01:02:06 +00:00
Stephen Chen
6a0c879de3 Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.
This flag enables the NetworkScoreService.requestRecommendations API,
defined in b/32909424.

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

Change-Id: If592e4a2ec574929aa0c829c39ad4ce9b0317805
2016-12-05 17:01:57 -08:00
Ned Burns
7d6cb913de Modify SwipeDismissLayout to perform its own exit animation
Instead of relying on the window animation system, in the special
case of a swipe-dismiss, disable any default window exit animation
and perform a custom animation. This bypasses some bugs in the
window animator codebase and allows us to have a nice "rebound"
animation if the user doesn't swipe far/fast enough to trigger a
dismiss.

Bug: 33041168
Change-Id: Ied45700d35a59950bacef1ba0650eaa5bc60fadb
2016-12-05 19:38:14 -05:00
Michael Kwan
1805ba1d76 Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938
am: 85ba660b16

Change-Id: Ia85402c3008cfd0a6b876fbda4a7a753c23d8a88
2016-12-05 18:14:46 +00:00
Michael Kwan
85ba660b16 Disable swipe-to-dismiss for not cancelable dialogs.
am: f7964be938

Change-Id: I6d71bb4c6acdc9d994766eebd7a6320356aa3a23
2016-12-05 18:09:10 +00:00
Michael Kwan
9120012566 Disable swipe-to-dismiss for not cancelable dialogs.
am: f7964be938

Change-Id: I4a6cad65f91368393272cd8f7d6012d131ec56ff
2016-12-05 18:09:07 +00:00
Alan Viverette
61edf5bbff Show popup transitions when there is no anchor set
Allow anchorRoot to be null when starting exit transition. Pushes
epicenter callback creation into startExitTransition. Adds nullability
annotations.

Bug: 33035511
Test: PopupWindowTest#testEnterExitTransition
Change-Id: Ie752a0d6b29d5eb11c160771d8a78fa6234de5bb
2016-12-05 10:56:18 -05:00
Lenka Trochtova
85bfbf1f62 Introduce a new user restriction for disallowing Bluetooth. am: 13a0519394
am: 3e149d59f9

Change-Id: I2622c1f9a92ff7784787885859c4b5a7cf974964
2016-12-05 15:44:01 +00:00
Lenka Trochtova
3e149d59f9 Introduce a new user restriction for disallowing Bluetooth.
am: 13a0519394

Change-Id: I3d875e1a7baf69022d58902689fa9370bcb44dc6
2016-12-05 15:37:34 +00:00
Lenka Trochtova
13a0519394 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

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 11:53:34 +01:00
Lenka Trochtova
f15cf38311 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

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 10:46:58 +01:00
Tobias Thierer
589ff8395d Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1 am: 6e2d3fa82f
am: 386ba42ec5

Change-Id: I0b0e8139cc084fbdf9918dd700d9be337e0c47df
2016-12-05 09:46:21 +00:00
Tobias Thierer
386ba42ec5 Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1
am: 6e2d3fa82f

Change-Id: I925b0ca87bbd0f3be3f03865f70cafaaa1ef25ba
2016-12-05 09:39:55 +00:00
Tobias Thierer
6e2d3fa82f Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am: 1e498a96c1

Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6
2016-12-05 09:35:10 +00:00
Tobias Thierer
1e498a96c1 Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" 2016-12-05 09:28:47 +00:00
Stephen Chen
50905a474f Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586 am: d738140b8d
am: a4d7d45df9

Change-Id: I5e2ad4633c19c7518bd3eee85aaf60c324d78154
2016-12-03 04:28:56 +00:00
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
Michael Kwan
f7964be938 Disable swipe-to-dismiss for not cancelable dialogs.
Bug: 33249829
Change-Id: Ib3d2c9982ece22d1b080b821eaf306f6b686d099
2016-12-02 17:33:56 -08:00
Treehugger Robot
d758ce1586 Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." 2016-12-02 23:41:36 +00:00
Jakub Pawlowski
c977c776c2 Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
* changes:
  BLE OOB Pairing - parse address type (5/5)
  Fix Bluetooth OOB pairing not working for unseen devices
  Add LE Secure Connection data parsing (1/4)
2016-12-02 20:14:03 +00:00
Jeff Sharkey
1fb6b55178 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1
am: 37d3eecbac

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

Change-Id: I762e09539e99d1cb8b6fd810992b27255774060d
2016-12-02 18:36:38 +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
5c44250176 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f am: bbcd9d26b1
am: 5806963539

Change-Id: Ic0e53ed482fb27dfab2bb8de52bfe8947beae866
2016-12-02 17:36:21 +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
Tobias Thierer
9f00d71787 Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64
Previously, they weres using libcore.io.Base64, which is @deprecated.

The two implementations' encoders produce the exact same result.

The two implementations' decoders' behavior differs for malformed
input:
 - In case of error, libcore.io.Base64.decode() returns null while
   java.util.Base64.getDecoder().decode() throws.
 - java.util.Base64 tends to be stricter about rejecting malformed
   input; specifically, it allows neither whitespace nor unexpected
   '=' characters (should only occur in the padding) whereas
   libcore.io.Base64.decode() leniently allows them throughout the
   input.
 - if the input terminates prematurely, libcore.io.Base64 tends to
   return fewer bytes (stops at a four byte boundary).

The behavior differences for malformed Base64 encoded data should
not affect ShortcutPackageInfo because it should only need to deal
with XML attribute values written by itself, which are well-formed.
Note that this CL does not lead to any known changes of the encoding
step, so values written by earlier versions should not cause problems
when read by later versions of ShortcutPackageInfo.

StrictJarVerifier may now reject or behave differently for .jar /
.zip files with malformed attribute values but this seems okay since,
per its name, it is meant to be strict. For example, after this CL,
StrictJarVerifier will no longer accept algorithm + "-Digest"
attribute values with extra whitespace or padding characters as valid.

Test: Confirmed that the two implementations' encoders produce the
      same result by running the following code just before this CL:
      assertEquals(
          libcore.io.Base64.encode(allBytes()),
          Base64.getEncoder().encodeToString(allBytes()));
      where allBytes() returns a byte[] with values (byte) 0 .. (byte) 255
Test: Test that phone still boots after flashing code that includes
      this CL.
Test: CtsLibcoreTestCases

Bug: 31292683

Change-Id: I775d32f329f693514a8f14d87e1ef0d7a757e6c3
2016-12-02 16:20:53 +00:00
Michal Karpinski
3db0a14ab0 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev 2016-12-02 09:26:31 +00:00
Jeff Sharkey
bf71af0f84 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80
am: 6dbcefeea6

Change-Id: Ic53e9c2543e75978f0b9b6e66c1444b97d1ce4d2
2016-12-02 02:16:33 +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
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
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
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