298079 Commits

Author SHA1 Message Date
John Reck
912bebeb74 Fix window copy for rotation = 90/270
Bug: 33421965
Test: Manual via PixelCopyWindow test in HwAccelerationTest
Change-Id: I2a59fd6a26499635a22444e124cd1ec6f82f6e31
2016-12-08 11:22:31 -08:00
Michal Karpinski
ea98e43600 Merge "Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent" 2016-12-05 16:56:12 +00:00
Etan Cohen
fc3d4896aa Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf am: 4c43aba36e
am: 4f6b7f87f8

Change-Id: I5c15d5915d5fd7ce84d150986af1f8d45b9a65dc
2016-12-05 16:14:19 +00:00
Etan Cohen
4f6b7f87f8 Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf
am: 4c43aba36e

Change-Id: I0a094416e0eaa1b09ec964cba3ec889ccca35eb6
2016-12-05 16:08:11 +00:00
ltrochtova
40a28bcbb8 Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours am: 8058dc0e82 -s ours am: ad5eb744aa -s ours
am: e1e2c1f1da  -s ours

Change-Id: Ifaf8d6c9f91cd12d812c458cdf575b771b4f206b
2016-12-05 16:04:11 +00:00
Etan Cohen
4c43aba36e Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826
am: 65617f21bf

Change-Id: I8428c743bf607a096674aa84cb8eda1929b55d84
2016-12-05 16:03:44 +00:00
Etan Cohen
65617f21bf Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
2016-12-05 15:57:37 +00:00
ltrochtova
e1e2c1f1da Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours am: 8058dc0e82 -s ours
am: ad5eb744aa  -s ours

Change-Id: I2468b18021198c8b1a7dfa739d28ec1aaafba9b1
2016-12-05 15:57:33 +00:00
Lenka Trochtova
8b643eb32a Introduce a new user restriction for disallowing Bluetooth. am: 13a0519394 am: 3e149d59f9
am: 85bfbf1f62  -s ours

Change-Id: I044d88fd6338b8958ac88e21cdd28ae79348602d
2016-12-05 15:51:36 +00:00
Etan Cohen
7241d28826 Merge "[AWARE] Fix javadocs for match filter update" 2016-12-05 15:51:18 +00:00
ltrochtova
ad5eb744aa Merge "Introduce a new user restriction for disallowing Bluetooth." am: 5fb37a7641 -s ours
am: 8058dc0e82  -s ours

Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a
2016-12-05 15:51:10 +00:00
ltrochtova
8058dc0e82 Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 5fb37a7641  -s ours

Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04
2016-12-05 15:44:06 +00: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
ltrochtova
5fb37a7641 Merge "Introduce a new user restriction for disallowing Bluetooth." 2016-12-05 15:35:22 +00:00
Michal Karpinski
da9d3ad3ac Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
Test: the APIs will be tested by CTS when unhidden
Bug: 29748723
Change-Id: I3a029afee57b79e3ffd9ef574969ec31156b1293
2016-12-05 13:32:01 +00:00
Lenka Trochtova
63d5e4a749 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: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 13:08:06 +01:00
Narayan Kamath
d291683d9f Merge "Parcel: Add support for reading/writing lists of Parcelables." 2016-12-05 11:01:58 +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
Jorim Jaggi
5968660525 Merge "Don't disable search on Keyguard" 2016-12-05 10:44:35 +00:00
Jorim Jaggi
6aa763bbed Merge "Deprecate FLAG_DISMISS_KEYGUARD" 2016-12-05 10:43:50 +00:00
Tobias Thierer
57723684f4 Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1 am: 6e2d3fa82f am: 386ba42ec5
am: 589ff8395d

Change-Id: I0861533c48a0eaa1972c95eb796b53dd0b2f3b8e
2016-12-05 09:52:58 +00: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
Sungsoo
e5da16d7dd resolve merge conflicts of a0f3e64 to master
Change-Id: I777a4410f89a8cc35db76ae0c98e54aee68703ad
2016-12-05 15:18:38 +09:00
Sungsoo Lim
a0f3e642a4 Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67 am: 582e612fdc
am: 52dd278eb3

Change-Id: I511eb25ec5124d989889fcf9da33a167eed63bcd
2016-12-05 04:54:35 +00:00
Sungsoo Lim
52dd278eb3 Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67
am: 582e612fdc

Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d
2016-12-05 04:47:33 +00:00
Sungsoo Lim
582e612fdc Merge "ExifInterface: fix NegativeArraySizeException"
am: c57b472d67

Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
2016-12-05 04:41:30 +00:00
Sungsoo Lim
c57b472d67 Merge "ExifInterface: fix NegativeArraySizeException" 2016-12-05 04:35:19 +00:00
Tomasz Mikolajewski
e4ba777a18 Merge "Add CATEGORY_TYPED_OPENABLE for ACTION_SEND[_MULTIPLE]." 2016-12-05 03:20:29 +00:00
TreeHugger Robot
9593f04fb2 Merge "ExifInterface: fix NegativeArraySizeException" 2016-12-05 02:22:46 +00:00
NIEJuhu
dbe99b56ec ExifInterface: fix NegativeArraySizeException
The IFD entry has a 4-byte field COUNT. It is read as int type
and is used as array size by ExifInterface. If a crafted JPEG
file contains a negative value, a NegativeArraySizeException
occurs.

Test: passed ExifInterface CTS
Change-Id: Ief29936400f04636928df09e7f357cbf25345383
Signed-off-by: NIEJuhu <niejuhu@xiaomi.com>
2016-12-05 09:18:58 +09:00
Yifan Hong
a0291419e1 Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a am: dab9e7bfc7 am: bc9c711513
am: ae68a5cb29

Change-Id: I29e0b6276239da96c0ab0f57c8b0841d079f2316
2016-12-03 23:28:31 +00:00
Yifan Hong
ae68a5cb29 Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a am: dab9e7bfc7
am: bc9c711513

Change-Id: I6047e1d936ef515d531a8ad4b875ab443ff2f50d
2016-12-03 23:22:40 +00:00
Yifan Hong
bc9c711513 Merge "Use IBase instead of IBinder for IServiceManager." am: 8ead2f0c9a
am: dab9e7bfc7

Change-Id: I8c39d01e0670d200c18ba02dbd3d09cea5a503c7
2016-12-03 23:15:52 +00:00
Yifan Hong
dab9e7bfc7 Merge "Use IBase instead of IBinder for IServiceManager."
am: 8ead2f0c9a

Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9
2016-12-03 23:10:08 +00:00
Treehugger Robot
8ead2f0c9a Merge "Use IBase instead of IBinder for IServiceManager." 2016-12-03 23:04:26 +00:00
TreeHugger Robot
c770b052ad Merge changes I71ed6927,If5687e31
* changes:
  NetworkMonitor: send one DNS probe per web probe
  NetworkMonitor metrics: add first validation information
2016-12-03 20:08:47 +00:00
TreeHugger Robot
0f0e424329 Merge "Use IBase instead of IBinder for IServiceManager." 2016-12-03 19:58:53 +00:00
Jean-Michel Trivi
ce8617c0df Merge "Volume dialog controller: make loading of stream names more robust" 2016-12-03 19:29:17 +00:00
Hugo Benichi
ab61e7c324 NetworkMonitor: send one DNS probe per web probe
This patch changes sligthly the two web probes mechanism for captive
portal detection and network validation so that DNS resolution is always
done for both probes.

In general the target web servers of the two parallel HTTP and HTTPS probes
are now different. This introduces a bias in the latency measurement of
th HTTPS probe since this latency will also include DNS resolution in
general.

Test: manual verification + $ runtest frameworks-net
Bug: 32198726
Change-Id: I71ed6927f5d9cdab0d0236cc147fe1c5735a1245
2016-12-04 03:39:16 +09:00
Hugo Benichi
147aa6d53b NetworkMonitor metrics: add first validation information
This patch adds first validation information to:
  - ValidationProbeEvent, by extending the probe_type int field of to
    also include a bit indicating if the probe was part of a first
    validation attempt or not.
  - NetworkMonitorEvent, by defining new contants for the event_type
    field.

Test: $ runtest frameworks-net
      + manually generating events and inspecting the
        output of $ adb shell dumpsys connmetrics list
Bug: b/32198726
Change-Id: If5687e310ddd18ed3096f8ecbdfc2ef866519234
2016-12-04 03:38:54 +09:00
Yifan Hong
95c1cd53d9 Use IBase instead of IBinder for IServiceManager.
Test: compiles with mma
Change-Id: I5805df48aa358dcef555125f6467d659f095b0c2
2016-12-03 15:15:35 +00:00
TreeHugger Robot
1d31ab693e Merge "Import translations. DO NOT MERGE" 2016-12-03 10:16:16 +00:00
Bill Yi
1b16871ea7 Import translations. DO NOT MERGE am: 52ae3289fb -s ours
am: b344ba69e6  -s ours

Change-Id: I55feaa7bef40a53abc0493199cce24e8e66106ab
2016-12-03 10:04:23 +00:00
Bill Yi
b344ba69e6 Import translations. DO NOT MERGE
am: 52ae3289fb  -s ours

Change-Id: I77c441b5116ab1dc8d9236cdb38bf776afaa88e4
2016-12-03 09:59:20 +00:00
TreeHugger Robot
0e1f49908c Merge "Import translations. DO NOT MERGE" 2016-12-03 09:48:48 +00:00