119658 Commits

Author SHA1 Message Date
Adrian Roos
70a0ea0e8d am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-14 16:27:51 +00:00
Baligh Uddin
46bfaa1b93 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
  Import translations. DO NOT MERGE
2014-03-14 16:27:44 +00:00
Dianne Hackborn
d4981014d4 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit 'e5191aabff5b9b751349b8634836a858af744905':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:27:40 +00:00
Jeff Brown
6adc96020f am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '825dd9dd38a42306d18a627768b16204cf4d8710':
  Retain display when creating specialized contexts. (DO NOT MERGE)
2014-03-14 16:27:35 +00:00
Zhihai Xu
57080be98e am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
2014-03-14 15:56:47 +00:00
Jeff Brown
6ae4d53b57 resolved conflicts for merge of db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
2014-03-13 21:07:33 -07:00
Adam Powell
41685ce983 am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
2014-03-13 23:53:38 +00:00
Narayan Kamath
aa737c49df am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
2014-03-13 18:18:48 +00:00
Naofumi Harada
03263ce38a am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
2014-03-13 18:18:45 +00:00
Chad Brubaker
74f99a4e90 am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
  Only allow System apps to make VPN exempt routes
2014-03-13 18:18:40 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
2014-03-13 18:18:36 +00:00
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +00:00
Adrian Roos
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-13 17:26:26 +00:00
Adrian Roos
cd0d8cb2d9 Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 2014-03-13 17:22:58 +00:00
Christopher Tate
aaaeb6a21b am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '87503f8561296fea489f8a3fe8384f61150976da':
  DO NOT MERGE - Don't hang installs if the transport disappears
2014-03-13 17:19:17 +00:00
Baligh Uddin
4c9ebc4c14 am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
  Import translations. DO NOT MERGE
2014-03-13 17:19:14 +00:00
Baligh Uddin
a5a921e3a8 am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
  Import translations. DO NOT MERGE
2014-03-13 16:25:45 +00:00
Baligh Uddin
4545b1d29b Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-13 16:22:53 +00:00
Adrian Roos
91c9561cbe DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
2014-03-13 13:42:29 +00:00
Alan Viverette
cf2b65ce7a am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
2014-03-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
2014-03-13 10:01:35 +00:00
Alan Viverette
af6288b721 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
2014-03-13 10:01:30 +00:00
Adam Powell
68ec033b7c am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
2014-03-13 10:01:15 +00:00
Jason Sams
0ebc6b378d Force merge of remaining KLP changes to fix build.
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
2014-03-13 01:49:05 -07:00
Jason Sams
fc15f899b8 Fix build issues from bad merge
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
2014-03-13 01:17:49 -07:00
Jason Sams
632c915ce8 resolved conflicts for merge of 780d57b8 to klp-modular-dev
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
2014-03-13 07:40:24 +00:00
Jason Sams
280db65032 am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds.
* commit 'e14d5e901172559a5e18077bde3ccafd03e8a6e2':
  Add hidden minor version ID for support lib workarounds.
2014-03-13 01:35:42 +00:00
Jason Sams
7f8a41079c am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '0165db3802f0fafe0ad86b7699be7adaea6686da':
  Fix destruction issues relating to AllocationAdapter.
2014-03-13 01:35:38 +00:00
Dianne Hackborn
e5191aabff am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit 'a796168da0ea139fe7312678f5031cd96c50097c':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-13 01:15:22 +00:00
Dianne Hackborn
a796168da0 Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 2014-03-13 01:12:13 +00:00
Jose Lima
f78e312db2 Add banner attribute to app manifest
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
2014-03-12 18:07:38 -07:00
Michael Wright
d23d916e0f Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 2014-03-13 00:37:10 +00:00
Jeff Brown
825dd9dd38 am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '73bd57f7abdb9eaf9239aa13945990acc6c97cd2':
  Retain display when creating specialized contexts. (DO NOT MERGE)
2014-03-13 00:15:19 +00:00
Jeff Brown
73bd57f7ab Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 2014-03-13 00:12:53 +00:00
Zhihai Xu
bdd4c31a22 am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '60d7c9957891280dfb131d5d58f32cf6fb82d5a2':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
2014-03-12 23:25:11 +00:00
Zhihai Xu
60d7c99578 Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 2014-03-12 23:22:38 +00:00
Zhihai Xu
7fb580ea4d DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.

bug:12495379
Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
2014-03-12 16:08:31 -07:00
RoboErik
ca9eef6203 b/12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
2014-03-12 13:21:08 -07:00
RoboErik
c1e0015ec3 b/12068020 Add a way to add uniqueness to device descriptors. Do not merge
Cherry pick from https://googleplex-android-review.git.corp.google.com/#/c/398226/

This adds an integer to the descriptor of devices without uniqely
identifying information. It will reuse values that are no longer
in use, so if you remove a single device and attach a different
identical device it will appear to be the same device.

TODO: Derive uniqueness from USB port when possible. This version
will generate different descriptors for each half of a USB keyboard
that shows up twice.

Change-Id: Ie628f19c01469f6ec2d354cd00000898ac6432fa
2014-03-12 13:20:57 -07:00
Michael Wright
b0aa4822f5 Controllers must have buttons and a movement mechanism.
Some devices have joystick axes or DPad keys, but no gamepad buttons
(or vice versa). We shouldn't count these as gamepads since games
can't really be expected to work with this setup in the general case.
Instead, require that a device has a movement mechanism (joystick
axes or DPad buttons), as well as at least one gamepad button before
considering it a controller.

Bug: 13432364
Change-Id: Ia113c8441557d4c858c1e5740a3e1c7e0e9fdcdd
2014-03-12 12:58:53 -07:00
Jeff Brown
0575b185c6 Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev 2014-03-12 19:16:42 +00:00
Jeff Brown
db3146c039 am 15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE)
* commit '15258ac86bb397206ac44c073baf184ffa0e62f2':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)
2014-03-12 18:49:09 +00:00
Dianne Hackborn
3026d0bf0a Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
The activity manager needs to set launchedFromPackage to be that of
the previous package in the case where flow has been redirected
through an intermediate activity.

Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca
2014-03-12 11:16:29 -07:00
Baligh Uddin
af7dcaadec Import translations. DO NOT MERGE
Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222
Auto-generated-cl: translation import
2014-03-12 09:09:05 -07:00
Jeff Brown
15258ac86b Fix power manager display wake lock bugs. (DO NOT MERGE)
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on.  This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
2014-03-11 23:28:22 -07:00
Jeff Brown
2d8a3908d2 Fix power manager display wake lock bugs.
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on.  This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
2014-03-11 23:23:58 -07:00
Jeff Brown
e39ef09896 Add a temporary hack to report screen on while dozing.
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing.  This will be fixed in a future patch to take the
display blanking state into account correctly.

This patch is a workaround to unblock development in the meantime.

Bug: 13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
2014-03-11 20:56:26 -07:00
Jeff Brown
f86c3a44f2 Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
2014-03-11 20:43:52 -07:00
Jeff Brown
cc9894c825 Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev 2014-03-12 03:42:20 +00:00
Jeff Brown
089886058a Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
2014-03-11 19:30:22 -07:00