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

147315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
09c3c2edb2 am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:30:06 +00:00
Deepanshu Gupta
ba31d62862 am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:25:50 +00:00
Deepanshu Gupta
db94ea9ed0 am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201 am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:18:04 +00:00
Deepanshu Gupta
79c3f678d2 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:09:13 +00:00
Deepanshu Gupta
72cf03a27a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3 resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
 2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c resolved conflicts for merge of 5476cfee to jb-mr1-dev 
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
 2014-08-06 14:41:02 -07:00
Igor Murashkin
733341bf0d camera2: (legacy) Support awb mode, test mode metadata keys 
Change-Id: Ic013aa820bbea02a662d546eb9f70baa20c0136e
 2014-08-06 14:35:40 -07:00
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib. 
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 21:28:24 +00:00
Dan Sandler
aa21e395f5 Need to post-process all action icons to get the correct color. 
This reverts commit fd266000212b33956d586807c76967b30b815cb6.

Bug: 16846210
Change-Id: I67e0acaacb6a4d9eb9a1a7392a7c647ff51c8f54
 2014-08-06 19:26:11 +00:00
Deepanshu Gupta
505c675c3a Fix SystemProperties in LayoutLib. 
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.

This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325

Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
 2014-08-05 17:47:30 -07:00
Robin Lee
2e7cf64842 Merge "Permit crash report button for user profiles" into lmp-dev 2014-08-05 00:35:13 +00:00
Robin Lee
cead2839a5 Permit crash report button for user profiles 
Loosens the restriction for reporting an issue with an app from "same
profile" to "same user".

Fixes bug 16792315.

Change-Id: I25100a3f7030b2a74e9fe40894103677e8db6cdd
 2014-08-07 10:11: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
00f201e41b Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 2014-08-05 00:35:13 +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
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
ce5bbbea08 Move image classes options from art to AndroidRuntime [frameworks/base] 
Bug: 15165413

(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)

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 4fd561637a173c7fa6a1d71e9115db1db90514ff)

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 f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)

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
Esteban Talavera
fe0f24cc92 Wipe only managed profile when max number of incorrect passwords exceeded 
When the maximum number of retries that has been exceeded is not for the primary profile of the user, wipe only the profile that set that policy (e.g. the managed profile) rather than the entire user. At the moment the whole device is wiped if the max number of incorrect passwords for a managed profile is reached, as the password is shared with the USER_OWNER.

Bug: 14453697
Change-Id: I5746de104133c0ea0a51d75b9c92e1516d365d8c
 2014-08-06 18:10:16 +01:00
Kenny Guy
83c7a53b4f Merge "Remove String version of getBadgedLabel" into lmp-dev 2014-08-05 00:19:02 +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
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +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
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
Adrian Roos
04e5f72cdb Merge "Update User switcher to new spec, implement adding users" into lmp-dev 2014-08-07 09:28:12 +00:00
Lajos Molnar
8d563a2077 ImageReader: fix documentation, relax some guarantees 
MediaCodec does not guarantee any of this.

Change-Id: Id73c917baad9ca72de87b98c16374505c8028e86
 2014-08-06 20:00:10 -07:00
Paul Jensen
8f333f1922 Switch CaptivePortalLogin app to use theme like Settings UI. 
The theme is switched to Theme.Material.Settings.  The progress bar
window feature is not supported in Material (b/16652978) so I added
a progress bar to the layout.  The Theme.Material.Setting's accent
color is set such that ProgressBars are indistinguishable, so accent
color is reset back to the parent's setting.

bug:15409354
Change-Id: Ic2862b8439be8591ec426f3d4dffad72179b2539
 2014-08-07 02:49:24 +00:00
Adrian Roos
ccdff62159 Update User switcher to new spec, implement adding users 
Also enforces restrictions on when guests can be added.

Bug: 15545213
Change-Id: Ia03747fbcc39f2b1b20876463c85afbac5057878
 2014-08-06 18:00:32 +02:00
Santos Cordon
7c7bc7f691 Add setConferenceable() API from ConnectionService to incall. (1/4) 
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
 2014-08-06 03:36:09 -07:00
Adrian Roos
5f2220df7f Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 2014-08-05 00:19:02 +00:00
Adrian Roos
b8b4774e61 Fix NPE in DevicePolicyManagerService that crashed SystemUI 
Bug: 16857795
Change-Id: I6234f03c4ee31311af9f9c556b790594ee1a8b2f
 2014-08-07 15:55:21 +02:00
Adrian Roos
3c9a350165 Pass initiatedByUser to TrustListeners 
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
 2014-08-07 15:13:09 +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
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
Glenn Kasten
72af075034 Merge "Add setting to disable automatic USB audio routing" into lmp-dev 2014-08-05 00:19:02 +00:00
Glenn Kasten
5f51635484 Add setting to disable automatic USB audio routing 
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
 2014-08-07 10:31:53 -07:00
Zoltan Szatmary-Ban
0f5efe0b44 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Jungshik Jang
7bbf9e720d Merge "Use message validator for sending message." into lmp-dev 2014-08-04 23:56:40 +00:00
Svetoslav
985e566cec Fix cross-user talk. 
An app can access widgets hosted or provided by its uid and package.
Access is also allowed if the caller has the bind app widgets permission
but this caller can be in the wrong user. Now the caller should not
only have the bind app widget permission but also be in the same user
as the host or the provider of the widget.

bug:16834230

Change-Id: I5ddb6309f63f2b4ba95360446c2b9584350fb66f
 2014-08-07 05:14:36 +00:00