Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,681 Commits 3 Branches 0 Tags
9df035b1aaa193b55cd81cb06dccf39dc5cbff30
Commit Graph

147681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
9df035b1aa am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev 
* commit '6cfeb8dcad12cdc3391b2f39c366ab339a6b1a06':
  Remove String version of getBadgedLabel
 2014-08-07 16:12:35 +00:00
Robert Ly
03b1c44ea6 am 3b3f443a: am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '3b3f443a7154a4c6b69445437e0b4e376ad66297':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:08:16 +00:00
Robert Ly
e915faa1d4 am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '001e30729a7e12bef238df680626042b2e99d807':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:04:07 +00:00
Robert Ly
001e30729a am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '23daa44107c17d7e30c65389bb718a9add8e4c40':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:59:36 +00:00
Robert Ly
23daa44107 am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:55:10 +00:00
Lajos Molnar
31a4ec1dfc am b18308b2: Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 
* commit 'b18308b2b2974efbe83301f7d30511c010a55cf1':
  ImageReader: fix documentation, relax some guarantees
 2014-08-07 15:46:52 +00:00
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +00:00
Robert Ly
8e115e6460 Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 2014-08-07 15:00:45 +00:00
Chet Haase
d9f0980441 am 95aab922: Allow TimePicker/DatePicker to use legacy layout style 
* commit '95aab922b35af8aa55d4340a971d07ac35d99d95':
  Allow TimePicker/DatePicker to use legacy layout style
 2014-08-07 14:32:51 +00:00
Chet Haase
3053b2fdcf Allow TimePicker/DatePicker to use legacy layout style 
In L, the TimePicker was rewritten to use a clock face and the
DatePicker was rewritten to use a calendar. This
change allows developers to opt into the old style instead
(android:timePickerMode="spinner|clock" and
android:datePickerMode="spinner|calendar").)

Issue #16717952 Pre-L style android.widget.TimePicker on L
Issue #16846963 Allow developer to use legacy DatePicker appearance

Change-Id: I4ee071fcbc5bf25eab83d6a5cb6ff352a603f90a
 2014-08-07 14:28:49 +00:00
Jorim Jaggi
bed756eeb2 am 8a6c6ec1: Merge "BG protection for user switcher on Keyguard." into lmp-dev 
* commit '8a6c6ec1add6ddca5ce3be73ac5ca042a604440d':
  BG protection for user switcher on Keyguard.
 2014-08-07 14:28:46 +00:00
Dan Sandler
7e170f9b19 am a20ca819: Merge "Need to post-process all action icons to get the correct color." into lmp-dev 
* commit 'a20ca819cc169c4d8d16d01a4d8ff95df32d1994':
  Need to post-process all action icons to get the correct color.
 2014-08-07 14:16:55 +00:00
Adrian Roos
68c01cb6ba am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit 'c23b9298ad3544aba73a426c47e84988c709aaeb':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:12:53 +00:00
Dan Sandler
2531b787ff am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '7868868812a8c383476fa8d2997f3acb3bde5865':
  Fix screenshots.
 2014-08-07 14:08:55 +00:00
Adrian Roos
e901a1540d am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit 'ae9b5cd05215910b69624d028b4288eb50972175':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:00:20 +00:00
Zoltan Szatmary-Ban
5a54a51567 am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit 'a37d22442a9472fc59d1f0be224e40627c7300b2':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:45:35 +00:00
Zoltan Szatmary-Ban
2e5bfc5204 am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '74535f61795732de57b7562d7c9bf4510c981d78':
  Update Trusted Credentials screen in settings
 2014-08-07 13:45:30 +00:00
Adrian Roos
1e9bee23ee am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit '5d07fda13caedfe14ed9a39e87d27e5d54982fa0':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:51:20 +00:00
Jorim Jaggi
c4489f990f Merge "BG protection for user switcher on Keyguard." into lmp-dev 2014-08-07 12:44:12 +00:00
Jorim Jaggi
bf1899e64c BG protection for user switcher on Keyguard. 
Also fixes the position.

Bug: 15757197
Bug: 15545213
Change-Id: I9fab98652ab1ccad4e02d5cfa17b212a72a0a0b3
 2014-08-07 15:45:53 +02:00
Dan Sandler
a909b28a13 Merge "Fix screenshots." into lmp-dev 2014-08-07 12:44:12 +00:00
Dan Sandler
deb0d11a43 Fix screenshots. 
Bug: 16861182
Change-Id: I9433cb4a5cc100d85f06eeed18ade3ead5ba8188
 2014-08-07 09:24:03 -04:00
Adrian Roos
0da7093840 Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 2014-08-07 12:44:12 +00:00
Adrian Roos
3c9a350165 Pass initiatedByUser to TrustListeners 
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
 2014-08-07 15:13:09 +02:00
Zoltan Szatmary-Ban
138b324d5d Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93 Revert "Update Trusted Credentials screen in settings" 
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
 2014-08-07 13:41:08 +00:00
Robin Lee
60317382b3 am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit '000ef01cdf74e1b95d28be2a465fe69ac747843b':
  Permit crash report button for user profiles
 2014-08-07 10:38:28 +00:00
Ji-Hwan Lee
4bba00b592 am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '1d0fc352aa10c1f97c8ff03445ebd8e701e4eff7':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:13:02 +00:00
Ji-Hwan Lee
956afc2ba7 TIF: Handle setMainSession for TV input wrapper services 
Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
 2014-08-07 10:05:30 +00:00
Esteban Talavera
8d5e98821c am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit 'cc22fede5a45c2702496a7dce41aeab51275c9f4':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:04:17 +00:00
Dan Sandler
09723fd04a Merge "Need to post-process all action icons to get the correct color." into lmp-dev 2014-08-07 09:28:12 +00:00
Adrian Roos
04e5f72cdb Merge "Update User switcher to new spec, implement adding users" into lmp-dev 2014-08-07 09:28:12 +00:00
Robin Lee
e272aa9512 am e07e39b7: Disallow switching managed profile to foreground 
* commit 'e07e39b75b8a25549ff9ab70f228e101727b4db2':
  Disallow switching managed profile to foreground
 2014-08-07 09:25:14 +00:00
Robin Lee
faa4b3cb06 Disallow switching managed profile to foreground 
Another check in the ActivityManager to stop us from getting into an
invalid state by a fat-fingered 'am switch' etc.

@bug 16814252

Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69
 2014-08-07 10:15:45 +01:00
Yuncheol Heo
88f061d400 am b0e4ff34: Allow to use device\'s own physical address. 
* commit 'b0e4ff34405ce270356f1975da845a408258e280':
  Allow to use device's own physical address.
 2014-08-07 09:10:51 +00:00
Yuncheol Heo
f6c73433ef am a566b462: Go to nap when receiving <Active Source> for the other devices. 
* commit 'a566b462221010df49304c39e172e8df454c1346':
  Go to nap when receiving <Active Source> for the other devices.
 2014-08-07 08:59:05 +00:00
Terry Heo
b2816936ac am e2a42d17: TIF: Add system API \'isSingleSessionActive()\' 
* commit 'e2a42d17504888dddde9b3c522f0a2de1af462ab':
  TIF: Add system API 'isSingleSessionActive()'
 2014-08-07 08:59:01 +00:00
Yuncheol Heo
7dea98f6f9 Allow to use device's own physical address. 
- Fixed JavaDoc.

Change-Id: I6fdbf6596b5f2e41a238b36e128ba0889725c813
 2014-08-07 17:58:59 +09:00
Yuncheol Heo
2849b7ccd1 Go to nap when receiving <Active Source> for the other devices. 
- Previously, it went to sleep when it got <Active Source>, but this
  causes the other side-effects like can't-wake-up when changing to HDMI
  port directly.

Bug: 15578870
Change-Id: I0ca5bd2372c9e5e7446592d66483900eeba75500
 2014-08-07 17:30:08 +09:00
Terry Heo
df9f0a321e TIF: Add system API 'isSingleSessionActive()' 
Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
 2014-08-07 08:07:17 +00:00
Brian Carlstrom
fb5a770c9f am 2e59c148: Move image classes options from art to AndroidRuntime [frameworks/base] 
* commit '2e59c1487263b9295b21c7adb9c19c58007a4578':
  Move image classes options from art to AndroidRuntime [frameworks/base]
 2014-08-07 06:25:22 +00:00
Brian Carlstrom
540bf5555b am 70705cac: Disable compilation based on vold.decrypt. [frameworks/base] 
* commit '70705cac115aa5b2694c18efa8b8a1fd38ab8401':
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-07 06:25:17 +00:00
Brian Carlstrom
6c0bb00acf am 19571b5e: Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base] 
* commit '19571b5e3484d8b50495af58972f67dfee2d07dd':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-07 06:25:12 +00:00
Alex Light
b6837432e2 am 8f3ac7f8: resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp 
* commit '8f3ac7f82c0c2a8515a7177d8db05bd0a690f936':
  resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
 2014-08-07 06:25:07 +00:00
Jungshik Jang
b09988cae2 am 6fd17d9b: Merge "Use message validator for sending message." into lmp-dev 
* commit '6fd17d9b3300c865acfba94bdb9fe3b0c1f3b202':
  Use message validator for sending message.
 2014-08-07 05:26:25 +00:00
Brian Carlstrom
ce5bbbea08 Move image classes options from art to AndroidRuntime [frameworks/base] 
Bug: 15165413

(cherry picked from commit 108166c749)

Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
 2014-08-06 22:25:01 -07:00
Brian Carlstrom
0d8fb01963 Disable compilation based on vold.decrypt. [frameworks/base] 
Bug: 15165413

(cherry picked from commit 4fd561637a)

Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
 2014-08-06 22:25:01 -07:00
Brian Carlstrom
3fbfbb4ade Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base] 
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit f60d3a4702)

Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
 2014-08-06 22:25:00 -07:00
Alex Light
a25dc2bbe7 resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp 
Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
 2014-08-06 22:25:00 -07:00
Svetoslav
d800c9f002 am 903f1840: Fix cross-user talk. 
* commit '903f18404f2c4994948bc27774b6875be274556a':
  Fix cross-user talk.
 2014-08-07 05:17:55 +00:00