232101 Commits

Author SHA1 Message Date
Sunny Goyal
40dedd5a97 Merge "Added support for async inflation of RemoteViews" 2016-02-03 19:31:09 +00:00
Vinit Deshpande
a772f0cf34 New System APIs for Passpoint r2 app.
Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
2016-02-03 11:28:21 -08:00
Svetoslav Ganov
d7595b3151 Merge "Add a couple of shared libraries - services, shared" 2016-02-03 19:25:52 +00:00
Rob Carr
48ab53e571 Merge "Remove obsolete conditional preventing surface placement." 2016-02-03 19:25:16 +00:00
Alan Viverette
634a808226 Improve handling of popup window exit when host window goes away
- Exit immediately if the anchor root is already detached
- End ongoing transition if anchor root is detached while exiting

Bug: 25691021
Change-Id: I8f9e721fba965060dc830ab3b674526def53f4ad
2016-02-03 14:22:41 -05:00
Doris Liu
d4fda02dd5 Fix NPE for invalid target exception
Change-Id: I57b319fae617792351c6ec9872c3b73cd25dc4e5
2016-02-03 11:10:49 -08:00
Ruben Brunk
574460f547 Merge "Connect VR HAL to VrManagerService." 2016-02-03 19:05:32 +00:00
Felipe Leme
de4e8e3a8e Created commands to manage metered networks.
These commands will be used primarily in the CTS tests:

- list metered-networks [BOOLEAN]
- get metered-network ID
- set metered-network ID BOOLEAN

For example, assuming the device has 2 wi-fi networks, and neither is metered:

// list all non-mobile networks
$ adb shell cmd netpolicy list metered-networks
wifi-A;false
wifi-B;false

// set wifi-A metered
$ adb shell cmd netpolicy set metered-network wifi-A true

// get wifi-A status
$ adb shell cmd netpolicy get metered-network wifi-A
true

// list only metered non-mobile networks
$ adb shell cmd netpolicy list metered-networks true
wifi-A;true

BUG: 26685616
Change-Id: I1ec8be4579477448fcb7f0d6cfa6b9cc6887fa97
2016-02-03 10:54:42 -08:00
Abodunrinwa Toki
cc9d617dca Make sure the scrollbar shows when the overflow is opened.
This helps users to tell that they can scroll the view.

Bug: 26955900
Change-Id: I49e65a3837b2610560dc1d049889e3cca2c32a0a
2016-02-03 18:32:42 +00:00
Chris Tate
eef4cb3efc Merge "fullBackupOnly=true means don't even think about key/value backup" 2016-02-03 18:29:23 +00:00
Chris Tate
220b845ba4 Merge "Send ALARM_CLOCK_CHANGED broadcast with REPLACE_PENDING" 2016-02-03 18:28:33 +00:00
Antonio Cansado
1e3f04f090 Merge "Adding a callback to notify data usage." 2016-02-03 18:16:51 +00:00
Aga Wronska
45f75e2a81 Stop current root reloading when it is clicked again
Bug: 25079217
Change-Id: I5d32be06d9eda4e5aced965030cce863e8a1965d
2016-02-03 10:09:35 -08:00
Eric Laurent
b09265df23 Merge "Bluetooth: Restrict gain for Absolute volume case" am: 81e7a58754
am: d24eb54b54

* commit 'd24eb54b5409997ece8e49ce2e57d27f8b41d778':
  Bluetooth: Restrict gain for Absolute volume case
2016-02-03 18:07:42 +00:00
Eric Laurent
d24eb54b54 Merge "Bluetooth: Restrict gain for Absolute volume case"
am: 81e7a58754

* commit '81e7a5875465f9b2b7ed785d4f138b11f386c5c1':
  Bluetooth: Restrict gain for Absolute volume case
2016-02-03 18:02:20 +00:00
Derek Sollenberger
0eef10e556 Merge "Update Canvas API with view system calls." 2016-02-03 17:59:11 +00:00
Geoff Mendal
b3187cc67d Merge "Import translations. DO NOT MERGE" 2016-02-03 17:55:05 +00:00
Geoff Mendal
a59ad81849 Import translations. DO NOT MERGE
Change-Id: Iad2ccbf1fef7c8ca217e78134a6fa66b738f97f8
Auto-generated-cl: translation import
2016-02-03 18:53:27 +01:00
Kenny Guy
c5947f8b76 Merge "Match non-crypto aware admins when registering." 2016-02-03 17:45:03 +00:00
Eric Laurent
81e7a58754 Merge "Bluetooth: Restrict gain for Absolute volume case" 2016-02-03 17:30:39 +00:00
Geoff Mendal
5aaac0152f Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:18:44 +00:00
Geoff Mendal
ff63640526 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8152fbd7e9 -s ours
am: f322b46028  -s ours

* commit 'f322b4602893a9cb3eae30ac0f4f196b3dc95176':
  Import translations. DO NOT MERGE
2016-02-03 17:17:01 +00:00
Paul Jensen
1a737fbd78 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:16:58 +00:00
Ben Kwa
501fde65b5 Merge "Lint fixes and config tweaks." 2016-02-03 17:12:53 +00:00
Paul Jensen
8514a8131f Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
am: 44307adcf3

* commit '44307adcf371bacad4de6925a9207bdbfdc6f874':
  Android packet filtering program interpreter test & program generator
2016-02-03 17:12:47 +00:00
Ben Kwa
e3aee18dc9 Lint fixes and config tweaks.
- Add recommended ignore properties to lint.xml.
- Make Fragment subclasses public.
- Truncate log tags at 23 chars.
- Fix one instance of passing a color ID instead of a color.
- Misc xml property fixes.

Change-Id: Ie8d6a8932cda72b7a239f6dfab56bd854f909820
2016-02-03 09:09:40 -08:00
Selim Gurun
061371b3ee Merge "Make abiOverride attribute public" 2016-02-03 17:09:09 +00:00
Paul Jensen
44307adcf3 Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev 2016-02-03 16:48:43 +00:00
Geoff Mendal
f322b46028 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 8152fbd7e9  -s ours

* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
  Import translations. DO NOT MERGE
2016-02-03 16:40:38 +00:00
Geoff Mendal
3852b0e888 Import translations. DO NOT MERGE am: a3144a52c6 -s ours am: 1a0c0953a0 -s ours
am: 04364c7464  -s ours

* commit '04364c74640965e92fb48be2c9ba0f4d75e1f8bf':
  Import translations. DO NOT MERGE
2016-02-03 16:40:29 +00:00
Florin Malita
7ee59adce5 Merge "Remove remaining references to SkCanvas::SaveFlags" 2016-02-03 16:29:22 +00:00
Geoff Mendal
04364c7464 Import translations. DO NOT MERGE am: a3144a52c6 -s ours
am: 1a0c0953a0  -s ours

* commit '1a0c0953a0ffebe876e9abcf63d2c3e8e2d12a6f':
  Import translations. DO NOT MERGE
2016-02-03 15:54:07 +00:00
Florin Malita
777bf85c16 Remove remaining references to SkCanvas::SaveFlags
One SkCanvas save flag reference snuck back in after the last
cleanup.  Convert to the new SaveFlags enum.

Change-Id: I9ba4b01a19bbb80276c84d30fd0d7b9513892cf9
2016-02-03 10:48:55 -05:00
Alan Viverette
1c9d20b535 Preserve TextView mDrawables if it has metadata (ex. tint or padding)
Bug: 26939206
Change-Id: Iccc8b3d50e93e50685d050ca6ea191708a0e6171
2016-02-03 10:45:55 -05:00
Geoff Mendal
8152fbd7e9 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-03 15:44:40 +00:00
Geoff Mendal
d6a791fc1f Import translations. DO NOT MERGE
Change-Id: I801233d391712c477e3b38b912465333b483a78b
Auto-generated-cl: translation import
2016-02-03 10:42:52 -05:00
Sudheer Shanka
5e8a6e5661 Merge "Add an utility method to get device owner." 2016-02-03 15:31:55 +00:00
Julia Reynolds
3fe81be015 Make 'total silence' more silent.
Bug: 25428208
Change-Id: Ibb5288430dc418dbb784a0fd7598612506285782
2016-02-03 10:30:45 -05:00
Geoff Mendal
1a0c0953a0 Import translations. DO NOT MERGE
am: a3144a52c6  -s ours

* commit 'a3144a52c63a8f69f0f79fe05070fd181bc70b1d':
  Import translations. DO NOT MERGE
2016-02-03 15:24:32 +00:00
Paul Jensen
d38fb7662d Android packet filtering program interpreter test & program generator
Change-Id: I17951bd6320b9eb3b6c43f2ae37f62c2025705c1
2016-02-03 10:19:13 -05:00
Geoff Mendal
d9eec15d84 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:58:49 +00:00
Geoff Mendal
a3144a52c6 Import translations. DO NOT MERGE
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
2016-02-03 09:57:33 -05:00
Geoff Mendal
1f7b7aecbd Import translations. DO NOT MERGE
Change-Id: I423629c9356693e4aa2fa8dfc9d32ff662e1d414
Auto-generated-cl: translation import
2016-02-03 06:53:26 -08:00
Erik Kline
3d51d8bacc Ignore link properties updates when nothing actually changed.
am: 6076cb0b85

* commit '6076cb0b859185b075d3a70655afb192d68d0774':
  Ignore link properties updates when nothing actually changed.
2016-02-03 14:37:11 +00:00
Erik Kline
e5345d8603 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 14:34:03 +00:00
Erik Kline
d33e6232fe Partial unification of DHCPv4 and static IPv4 configuration codepaths
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
2016-02-03 14:29:32 +00:00
Erik Kline
e056b88755 Partial unification of DHCPv4 and static IPv4 configuration codepaths
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
2016-02-03 14:25:36 +00:00
Kenny Guy
8c41a1c9bc Match non-crypto aware admins when registering.
Profile owners are registered before the user is
started and unlocked, so we need to check for
components that aren't cryptoware when looking
for the admin.

Bug: 26924254
Change-Id: I61fca0a3d6e490ca6fea9a7bdc8f2c44efde74f2
2016-02-03 14:20:30 +00:00
Geoff Mendal
adf19a8402 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:16:20 +00:00
Geoff Mendal
18e74d09d5 Import translations. DO NOT MERGE
Change-Id: I6b612ab71f970dc349b0178e3c9f4008dbfbe1fa
Auto-generated-cl: translation import
2016-02-03 06:13:05 -08:00