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

50184 Commits

Author SHA1 Message Date
Winson Chung
b7a6e198fe Merge changes I5d21645b,I8928e357 
* changes:
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.
 2014-05-09 23:25:58 +00:00
Winson Chung
aca960204e Fixing NPE in accessing theme attribute. 
Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544
 2014-05-09 16:18:55 -07:00
John Reck
c42bfb95c6 Merge "Refactor VirtualLightRefBase & JNI" 2014-05-09 23:18:26 +00:00
Dianne Hackborn
a90f9e435f Merge "Battery stats tweaks." 2014-05-09 22:34:36 +00:00
John Reck
9fa4071c47 Refactor VirtualLightRefBase & JNI 
Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
 2014-05-09 15:28:54 -07:00
Kenny Root
e928957316 Merge "WindowManagerService: add some defensive checks" 2014-05-09 22:20:20 +00:00
Selim Gurun
049803a00e Merge "Cleanup remainings of old webview." 2014-05-09 21:50:31 +00:00
Chris Craik
07d70172a6 Merge "Fix Bitmap.cpp line endings" 2014-05-09 21:39:48 +00:00
Ruchi Kandoi
f974cc8706 Display: Brightness: Low power mode scales the brightness to 50 percent. 
When the device is in low power mode all changes to brightness will be
scaled to half of the brightness that would be normally set when not in
low power mode.

Change-Id: I03be820ef64c1d5631ded35f7dfc2799e807226b
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2014-05-09 21:17:33 +00:00
Vinod Krishnan
07bb4c3063 Merge "resolved conflicts for merge of 88aa8aab to master" 2014-05-09 21:11:08 +00:00
Dianne Hackborn
37de098935 Battery stats tweaks. 
- Generate currently active events when a partial
  history is requested.
- Tag wake lock release with the wake lock name if it is
  different than the one that was acquired.
- New RESET mark for the start of the history.

Change-Id: Ic105656649c46f52855946ed0ad7f98f1d24dedc
 2014-05-09 14:07:38 -07:00
Chris Craik
32054b0b3e Fix Bitmap.cpp line endings 
Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
 2014-05-09 13:59:36 -07:00
Vinod Krishnan
4a3735d081 resolved conflicts for merge of 88aa8aab to master 
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
 2014-05-09 13:23:41 -07:00
Alan Viverette
5e92c95d84 Animated state transition drawable 
Change-Id: I6c795d55cd7ab9163fdd6fe6ce3771bbd7015d62
 2014-05-09 13:03:12 -07:00
Dan Sandler
3f4c72f42b Merge "Fix misaligned vectors. #cannotunsee" 2014-05-09 19:39:59 +00:00
Dan Sandler
0b9c9f745c Fix misaligned vectors. #cannotunsee 
Change-Id: Idacc34dc77a811b6355a19b4715309f4e4e29fde
 2014-05-09 15:38:30 -04:00
Yin-Chia Yeh
e2e5527ef3 Merge "Camera2: Minor update for exposureCompensation spec" 2014-05-09 19:02:09 +00:00
Yin-Chia Yeh
a4227dfe48 Camera2: Minor update for exposureCompensation spec 
doc change only

Change-Id: I4bcc461cd9d592d5b15beda45f2b6176d7efde37
 2014-05-09 12:01:10 -07:00
Vinod Krishnan
88aa8aab3d am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 18:09:53 +00:00
Kenny Root
d7d2d43b49 WindowManagerService: add some defensive checks 
Add checks before posting a message to the handler thread where
exceptions will crash the service.

Also make KeyguardLock fields final.

Bug: 14564617
Change-Id: I147d579d942f5fa555714d204cde52e2cd5f6154
 2014-05-09 11:08:54 -07:00
Vinod Krishnan
c4ebd014ce Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d Adding a margin for the AlertDialog to work on circular UI. 
- also removing the background completely for sdk >= 20

Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
 2014-05-09 11:03:20 -07:00
Craig Mautner
d9ddf2e9d0 Merge "Introduce persistent forms of Activity lifecycle calls." 2014-05-09 17:38:53 +00:00
Jason Monk
c241db85c9 Merge "Fix badness from proxy refactoring." 2014-05-09 17:11:15 +00:00
Craig Mautner
a002604af0 Introduce persistent forms of Activity lifecycle calls. 
When an Activity is created with R.attr.persistable true different
forms of activity lifecycle methods including PersistableBundle will
be used.

Fixes bug 13736007.

Change-Id: I7e92917b300b76964257cfcc26c24e76aa19bd16
 2014-05-09 09:42:37 -07:00
Mikhail Naganov
3b2f548b67 am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'a08771edfaabab8c2f1f1d552f788c9c4a4162f9':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:26:19 +00:00
Mikhail Naganov
a08771edfa am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:19:12 +00:00
Mikhail Naganov
fa75ff626c am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'b76bc8e06e456715a36edd92cb4ea5437d5306e4':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:14:16 +00:00
Mikhail Naganov
b76bc8e06e am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:08:58 +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
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
Jason Monk
5df281a570 Fix badness from proxy refactoring. 
When no PAC file getPacFileUrl() can return null now, which you
cannot call toString() on.

Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
 2014-05-09 09:53:08 -04: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
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
a8c5f577d0 Merge "Add api for getting the parent of a profile." 2014-05-09 09:33:28 +00:00
Selim Gurun
2bfd9839aa Cleanup remainings of old webview. 
Cleanup some code that remained from old webview.

Change-Id: I7b654a40284ff88a0a42c7407ad0b2499000f77d
 2014-05-08 19:33:58 -07:00
Ashish Sharma
bffcf1c2da Bump the batterystats checkin stats version number. 
Change-Id: Ie403b89022e4d1f6ad0e07e70c95f39a1d5fa530
 2014-05-09 02:03:55 +00:00
Michael Wright
786efab54d Merge "Temporarily remove the dpad keys from system keys." 2014-05-09 00:28:59 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +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
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +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
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
Jessica Hummel
be81c800ae Add api for getting the parent of a profile. 
Change-Id: Ife59665cdf6531a118d74def864c8cfc92c92a42
 2014-05-08 14:17:07 -07:00