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

134205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
9f1c7c9d5b am 44c7a657: am 8bfb3513: (-s ours) am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '44c7a657a699aa4c6ba14bb6fea1accc3aa7f2f1':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:59:32 +00:00
Eino-Ville Talvala
6515444dee am 8bfb3513: (-s ours) am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:55:43 +00:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Jessica Hummel
fa863aaf08 am 1be633f9: Allow setting password restrictions from a managed profile. 
* commit '1be633f96798cc86be644ab0952e6449464c9860':
  Allow setting password restrictions from a managed profile.
 2014-05-09 15:19:54 +00:00
Jessica Hummel
91da58ded2 Allow setting password restrictions from a managed profile. 
A managed profile will now share password settings with its parent.

- the current password is always stored in the parent
- admins of profiles are notified if that password changes
- checks for password quality now take the requirements of admins on
   the parent and its profiles into account

Todo:

- Currently KeyguardSecurityContainer wipes the whole device when
  the maximum fails has been reached on any profile.
  We need to limit the wipe to the profile for which the fails exceeded
  the maximum number.
- Intents with ACTION_SET_NEW_PASSWORD need to be forwarded to the parent
  of the profile when sent from a managed profile

Change-Id: I8532c59f753f8d9c61200f553f275214ad90276e
 2014-05-09 16:16:02 +01:00
Jorim Jaggi
2c338499b9 am f80ea6a9: Merge "Fix lockscreen occluded states #2." 
* commit 'f80ea6a9a7ef17e67a0f528659347ab0b3242f09':
  Fix lockscreen occluded states #2.
 2014-05-09 14:17:54 +00:00
Jorim Jaggi
943ac44a68 Merge "Fix lockscreen occluded states #2." 2014-05-09 14:13:15 +00:00
Jorim Jaggi
43bdbbdad6 Fix lockscreen occluded states #2. 
Bug: 14656767
Bug: 14294001
Change-Id: Ibc428cbba8b48b6adc26756d8276a63183b8a690
 2014-05-09 16:05:53 +02:00
Ben Murdoch
f127d9eb63 am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION 
* commit 'b17860213f101a17f95d2ca95dce7171dd62bf6a':
  Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
 2014-05-09 14:01:26 +00:00
Ben Murdoch
b2e56e34de Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION 
We haven't hooked this constant up yet, so @hide from the API until
it's ready.

Bug: 14668406
Change-Id: Ia0bb2ac1deaa0575d5ceb509997ca27f930040b0
 2014-05-09 13:25:48 +01:00
Yohei Yukawa
baabe3ecc2 am e6d58c4c: Merge "Introduce new API for floating window support" 
* commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6':
  Introduce new API for floating window support
 2014-05-09 10:47:09 +00:00
Yohei Yukawa
2ac9979179 Merge "Introduce new API for floating window support" 2014-05-09 10:43:44 +00:00
Yohei Yukawa
c2ddd60236 Introduce new API for floating window support 
This CL introduces a new API IMM#updateCursorAnchorInfo for
floating window support.

BUG: 14579622
Change-Id: I61dec2f8fa671ba891da1d4af08975750e3acb04
 2014-05-09 19:17:15 +09:00
Jessica Hummel
5a2e76a4e0 am 690022d1: Merge "Add api for getting the parent of a profile." 
* commit '690022d14be0251b6e618b01e3f448cb49e61241':
  Add api for getting the parent of a profile.
 2014-05-09 09:38:45 +00:00
Jessica Hummel
a8c5f577d0 Merge "Add api for getting the parent of a profile." 2014-05-09 09:33:28 +00:00
Elliott Hughes
92c45b222c resolved conflicts for merge of 6a4c12da to master-nova 
Change-Id: I108a86d599b0d692f8d13f8f3d29187db45c6467
 2014-05-08 20:23:39 -07:00
Elliott Hughes
242c14bee5 Merge "Unhide android.system.Os." 2014-05-09 03:08:38 +00:00
Ashish Sharma
29e832bcce am b87cf3a0: Bump the batterystats checkin stats version number. 
* commit 'b87cf3a06618d67ec37a299a385f80466b72d9bd':
  Bump the batterystats checkin stats version number.
 2014-05-09 02:09:11 +00:00
Ashish Sharma
bffcf1c2da Bump the batterystats checkin stats version number. 
Change-Id: Ie403b89022e4d1f6ad0e07e70c95f39a1d5fa530
 2014-05-09 02:03:55 +00:00
Elliott Hughes
8c126621ef Unhide android.system.Os. 
Change-Id: I35fc0cfc723155e7562f711fa52b1df6694f3d2e
 2014-05-08 19:03:06 -07:00
vandwalle
e29aceaeab am 2d788324: Merge "Don\'t crash when asked to enable an AP with a null SSID." 
* commit '2d78832443f5d6491c75e5641ea2e16b7dffa8d2':
  Don't crash when asked to enable an AP with a null SSID.
 2014-05-09 00:53:03 +00:00
vandwalle
87b4e50bbd Merge "Don't crash when asked to enable an AP with a null SSID." 2014-05-09 00:49:29 +00:00
vandwalle
60a28c6c4b Don't crash when asked to enable an AP with a null SSID. 
WifiConfiguration can have been build by an app with a NULL SSID, or
other null fields. We need to verify that at least that those fields
are not NULL before using them. More specifically, don't crash when
enabling an AP with a null SSID in setApConfiguration function.

Bug: 14568953
Change-Id: I6b33ddf97789c0ee4b850d3ec0bccb08100c21d5
 2014-05-09 00:43:35 +00:00
Michael Wright
dfeab22a1e am 86d53d01: Merge "Temporarily remove the dpad keys from system keys." 
* commit '86d53d0107e829c537490c97700397452c728556':
  Temporarily remove the dpad keys from system keys.
 2014-05-09 00:33:32 +00:00
Michael Wright
786efab54d Merge "Temporarily remove the dpad keys from system keys." 2014-05-09 00:28:59 +00:00
Martijn Coenen
66f29aa4a5 am 5aa45ef5: Merge "HCE/SE foreground support." 
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
  HCE/SE foreground support.
 2014-05-08 23:37:00 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +00:00
Eric Laurent
5b5c09c759 am 22477a4d: Merge "AudioService/WireAccessoryManager: change boot completion detection method" 
* commit '22477a4d7df9ac1a2b186325bb4d92aedace5a02':
  AudioService/WireAccessoryManager: change boot completion detection method
 2014-05-08 23:29:37 +00:00
Eric Laurent
82af2b9e51 Merge "AudioService/WireAccessoryManager: change boot completion detection method" 2014-05-08 23:25:49 +00:00
Glenn Kasten
e57c25dcde am a1da4e35: Merge "Add hidden support for ENCODING_PCM_FLOAT to AudioTrack" 
* commit 'a1da4e35ff7a0651cff96ec5dbebd6a4bb160383':
  Add hidden support for ENCODING_PCM_FLOAT to AudioTrack
 2014-05-08 23:24:17 +00:00
Glenn Kasten
eea64a928e Merge "Add hidden support for ENCODING_PCM_FLOAT to AudioTrack" 2014-05-08 23:19:49 +00:00
Michael Wright
7c1c71e27b Temporarily remove the dpad keys from system keys. 
Bug: 14438911
Change-Id: Ibb58a4af89585b6e266f5236df22f0465dd17bd4
 2014-05-08 16:14:11 -07:00
Glenn Kasten
54955e33c8 Add hidden support for ENCODING_PCM_FLOAT to AudioTrack 
Change-Id: I15e6d6ab34846366e7f5cbf948fd3cb327e72632
 2014-05-08 16:11:42 -07:00
Winson Chung
9194acc50f am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they trigger a new task." 
* commit '12c9e3a00bf912167d1c40a356d19301c93bfdd0':
  Removing the old tasks on launching recents task if they trigger a new task.
 2014-05-08 22:38:15 +00:00
Winson Chung
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Ruchi Kandoi
8f75156f2f am e4c0ca15: Vibrator: Low Power Mode: Vibrator is turned off when the device is in Low Power Mode 
* commit 'e4c0ca15b2061cab001986712c64aa1e50381e7e':
  Vibrator: Low Power Mode: Vibrator is turned off when the device is in Low Power Mode
 2014-05-08 22:11:47 +00:00
Dianne Hackborn
d9225ba404 am 60549e20: Merge "Usage stats!" 
* commit '60549e202fd57679b0ead98224264c3308106ebd':
  Usage stats!
 2014-05-08 22:04:02 +00:00
Ruchi Kandoi
13b03aff29 Vibrator: Low Power Mode: Vibrator is turned off when the device is in 
Low Power Mode

Vibrator is disabled for all touching and typing inputs during low power mode.

Change-Id: I762be1d51eedbf3184d80ed51dc93a0d113a6d5d
 2014-05-08 22:02:25 +00:00
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +00:00
Chris Wren
3783169c10 am f8e933f9: am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit 'f8e933f9882e7ee627c7189e4ab650a20531e58a':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:50:47 +00:00
Baligh Uddin
8b69992717 am befca9de: (-s ours) am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'befca9de237cf212962b62b184d8f14a944962da':
  Import translations. DO NOT MERGE
 2014-05-08 21:50:44 +00:00
Eino-Ville Talvala
0a7540c53a am 59969600: Merge "Add android.hardware.camera.external feature." 
* commit '599696000400582773dcff7b6142b603ef68ec6b':
  Add android.hardware.camera.external feature.
 2014-05-08 21:50:32 +00:00
Svetoslav
bbe22eb8d3 am a026d635: PrintManager should not crash if print fueature is not available. 
* commit 'a026d63594fafaae046ec97dede2a6a3ed961e66':
  PrintManager should not crash if print fueature is not available.
 2014-05-08 21:50:28 +00:00
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 21:47:36 +00:00
Chris Wren
201f9b8d49 am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '2dc97d48b924e0ea196404d5adbe5084b344d25e':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:43:13 +00:00
Baligh Uddin
3153c179d8 am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '33c08e2986832fa32fc08350f946e7c2e8f2b3a6':
  Import translations. DO NOT MERGE
 2014-05-08 21:42:00 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
Svetoslav
2235a1772f PrintManager should not crash if print fueature is not available. 
Printing is one of the optional software features. If the device does not
have the feature, then the print APIs should do nothing. Before, a NPE
crash was happening.

bug:14651902

Change-Id: I63efa75be51e8957ca6854b2b439918f01c0f154
 2014-05-08 14:25:51 -07:00
Winson Chung
5393dff555 Removing the old tasks on launching recents task if they trigger a new task. 
- Only kill processes when removing tasks that are not started as documents
- Tweaking thumbnail animation
 2014-05-08 14:25:43 -07:00
Chris Craik
53a320c127 am db8807e0: Merge "Add logging utility methods" 
* commit 'db8807e06c1a1ea7f101843b8e2d7562800113d0':
  Add logging utility methods
 2014-05-08 21:18:04 +00:00