drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,027 Commits 1 Branch 0 Tags
Commit Graph

116027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
78f204aed8 am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-13 18:12:36 +00:00
Chad Brubaker
8e240af51d Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 2014-03-13 18:09:58 +00:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +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
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
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
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
Svetoslav
b628dd825b PrintSpooler crash if printer is reported to have only one color mode. 
bug:11993304

Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
(cherry picked from commit b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)
 2014-03-12 14:20:27 -07: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
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
Adam Powell
898d6d964c am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-11 23:26:38 +00:00
Adam Powell
7f2c9e9420 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 2014-03-11 23:19:37 +00:00
Narayan Kamath
9af19bee1c am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
* commit '52af2ca919c068f1c9389fa4c979d2fe3105af40':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-11 23:18:18 +00:00
Naofumi Harada
3b18226133 am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '68c0346b22d11a0e2c5e89f1a9206bc06ad3d0cf':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-11 23:18:00 +00:00
Adam Powell
15b13a792c Add a config override for ViewConfiguration#hasPermanentMenuKey 
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Bug 11698700

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
 2014-03-11 21:20:13 +00:00
Narayan Kamath
52af2ca919 DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
We'd otherwise leave the data dirs & native libraries
lying around. This will leave the app permanently broken
because the next install of the app will fail with
INSTALL_FAILED_UID_CHANGED.

Also remove an unnecessary instance variable.

Cherry-pick from master
Bug 13416059

Change-Id: I1e644aab74d5ea519231800915b39c2f55d043ae
 2014-03-11 14:06:55 -07:00
Naofumi Harada
68c0346b22 DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.

Bug: 12640283

Cherrypick from master.

Change-Id: I833d94cd911693c9291e8204f63bd8de945dbba6
 2014-03-11 12:26:21 -07:00
Chad Brubaker
7fb0743893 am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '674f85af4c04970ec8875669b3f08eaf0465ba4b':
  Only allow System apps to make VPN exempt routes
 2014-03-11 19:22:43 +00:00
Chad Brubaker
1011960c44 am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'decfd7079b622f9135aeb8f7b2ec48005c844c38':
  Add the calling package name to requestRouteToHost
 2014-03-11 19:22:39 +00:00
Chad Brubaker
a1d7c74449 Remove SO_BINDTODEVICE from VPN protect 
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
 2014-03-11 10:58:19 -07:00
Chad Brubaker
674f85af4c Merge "Only allow System apps to make VPN exempt routes" into klp-dev 2014-03-11 17:51:50 +00:00
Chad Brubaker
decfd7079b Merge "Add the calling package name to requestRouteToHost" into klp-dev 2014-03-11 17:51:45 +00:00
Christopher Tate
87503f8561 am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'e9821bf2380bfa325e6398a6390a4083007d3006':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-11 17:37:06 +00:00
Baligh Uddin
c6ccb8a3d4 am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7138395b26fcad9664ad05b9c98109f60db8a557':
  Import translations. DO NOT MERGE
 2014-03-11 17:37:03 +00:00
Christopher Tate
e9821bf238 Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev 2014-03-11 17:34:15 +00:00
Baligh Uddin
7138395b26 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:33:28 +00:00
Alan Viverette
9ebe031cdc am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '6e6dc23c692b14f5e70ee1453eab726978e4984e':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-11 02:15:26 +00:00
Alan Viverette
7b09a4e5df am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'e910a7ce8b42580b8bc184dfc340859a65e98c80':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-11 02:15:24 +00:00
Alan Viverette
3c3377a229 am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 02:15:21 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
75958c2984 am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '3a153c0de271a004710e5ac545c48778f7e51b12':
  Fix a bug in submenu presenter priority handling
 2014-03-11 01:24:47 +00:00
Adam Powell
3a153c0de2 Merge "Fix a bug in submenu presenter priority handling" into klp-dev 2014-03-11 01:22:10 +00:00
Jason Sams
780d57b81a am cf8573c1: Fix destruction issues relating to AllocationAdapter. 
* commit 'cf8573c15456c4581b691c7380722ea6dccf11c5':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:32 +00:00
Jason Sams
e14d5e9011 am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '5757bf89c44e7a4805340b5634bec13a1caf39f8':
  Add hidden minor version ID for support lib workarounds.
 2014-03-11 01:12:29 +00:00
Jason Sams
0165db3802 am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit 'ff7256e757502279b1777127a12eba235be679ae':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:23 +00:00
Christopher Tate
4bda43777c DO NOT MERGE - Don't hang installs if the transport disappears 
Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
 2014-03-10 18:07:12 -07:00