Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,325 Commits 3 Branches 0 Tags
7e53b6389a531d49bcd418a53febdb2e7ef0bb30
Commit Graph

39432 Commits

Author SHA1 Message Date
Adam Powell
7e53b6389a am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API"" 
* commit 'faf2e7ffa99643144db4a3857e002e6ad31be355':
  Revert "Remove the View#initializeScrollbars API"
 2014-05-10 01:55:07 +00:00
Adam Powell
17048b84ec Merge "Revert "Remove the View#initializeScrollbars API"" 2014-05-10 01:51:54 +00:00
Adam Powell
d20aa6c531 Revert "Remove the View#initializeScrollbars API" 
Looks like there are some bugs in the API checker for @removed.

This reverts commit 172c26e20fd71a2b4489a80b96ea5f6292db6430.

Change-Id: Ia4e610f71af19c5521fc019b9a6c26d0c11f23f1
 2014-05-10 01:51:27 +00:00
Adam Powell
0a2fc15370 am 82902c45: Merge "Remove the View#initializeScrollbars API" 
* commit '82902c457f76971763758c67d5ef6068d9069239':
  Remove the View#initializeScrollbars API
 2014-05-10 01:09:29 +00:00
Adam Powell
0604dbc18e Merge "Remove the View#initializeScrollbars API" 2014-05-10 01:03:52 +00:00
Adam Powell
5d4c35d1ea Remove the View#initializeScrollbars API 
This was never a safe API for apps to call since the TypedArray
parameter must have been obtained by filtering on
android.R.styleable.View, which is not public. Any behavior in the
wild has therefore been undefined.

Change-Id: Id19f571c92748ef2a8c036072fd83a417527f779
 2014-05-09 17:32:38 -07:00
Winson Chung
7a5556d047 am 5b1a0a46: Merge "Fixing crash in Activity.onApplyTheme()." 
* commit '5b1a0a46a125d1e2f4c469a964feac5321f6e933':
  Fixing crash in Activity.onApplyTheme().
 2014-05-09 23:47:25 +00:00
Winson Chung
77dd7ce506 Merge "Fixing crash in Activity.onApplyTheme()." 2014-05-09 23:42:49 +00:00
Winson Chung
4d1a434cbd Fixing crash in Activity.onApplyTheme(). 2014-05-09 16:42:00 -07:00
Winson Chung
0b20f57caf am ed517771: Merge changes I5d21645b,I8928e357 
* commit 'ed517771f4b6a6e59f49dee56ae21e7b95c6fa99':
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.
 2014-05-09 23:32:40 +00:00
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
John Reck
e7bbfa53a6 am 2d3af881: Merge "Refactor VirtualLightRefBase & JNI" 
* commit '2d3af881e9d38b418c1037e9e8e07dbd8580f990':
  Refactor VirtualLightRefBase & JNI
 2014-05-09 23:25:04 +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
49e9b0ad5f am 1668b19d: Merge "Battery stats tweaks." 
* commit '1668b19d4ce7361144a6668b52434508d8311ab2':
  Battery stats tweaks.
 2014-05-09 22:43:09 +00:00
Kenny Root
70f9d49333 am 6b2350ac: Merge "WindowManagerService: add some defensive checks" 
* commit '6b2350ac016277b0cd57bda11e6137ecef34bf8f':
  WindowManagerService: add some defensive checks
 2014-05-09 22:43:03 +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
Selim Gurun
8267a95ed4 am f37bec2b: Merge "Cleanup remainings of old webview." 
* commit 'f37bec2bcce152f9cc787d508dd3c480f712a5e9':
  Cleanup remainings of old webview.
 2014-05-09 22:26:23 +00:00
Ruchi Kandoi
671ef1f0db am 2a894fed: Merge "Display: Brightness: Low power mode scales the brightness to 50 percent." 
* commit '2a894fedba24b816ed930c55f28e857990f6806a':
  Display: Brightness: Low power mode scales the brightness to 50 percent.
 2014-05-09 22:26:14 +00:00
Vinod Krishnan
a58405ef46 am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master" 
* commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 22:26:04 +00:00
Yin-Chia Yeh
133fca21d7 am 91325444: Merge "Camera2: Minor update for exposureCompensation spec" 
* commit '91325444a1d7c9de947ee055ddfbac9316117234':
  Camera2: Minor update for exposureCompensation spec
 2014-05-09 22:25:30 +00: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
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
Vinod Krishnan
4a3735d081 resolved conflicts for merge of 88aa8aab to master 
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
 2014-05-09 13:23:41 -07: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
8ce0279fa5 am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls." 
* commit '87bf3b28f3b94464384c8f6adb7867233c960543':
  Introduce persistent forms of Activity lifecycle calls.
 2014-05-09 17:44:37 +00:00
Craig Mautner
d9ddf2e9d0 Merge "Introduce persistent forms of Activity lifecycle calls." 2014-05-09 17:38:53 +00:00
Jason Monk
52cb4ef7c9 am d8bbf999: Merge "Fix badness from proxy refactoring." 
* commit 'd8bbf9994979e17c18f65b4e4ae3231187f1e3a5':
  Fix badness from proxy refactoring.
 2014-05-09 17:16:46 +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
b33122ff42 am f25ec68c: am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'f25ec68c973bdd6cd78f2b592a5f756219e0a4b7':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:30:41 +00: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
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
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
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