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

147185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
db92e35211 Fix build break 
Change-Id: I7af700671f1a2e910b6e08498381c8adb40631f8
 2014-08-07 11:23:03 -07:00
Sandeep Siddhartha
256e1a6267 Handle same keyphrase for multiple users 
Also notify the VIS of a change after finishing the change

Bug: 16816191
Change-Id: I6c96595819cd07182c3825c522d9bae559bb6814
 2014-08-07 10:50:18 -07:00
Sandeep Siddhartha
a13104fe7d Merge "Read audio format from the recognition event" into lmp-dev 2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
2178e2e085 Read audio format from the recognition event 
Bug: 16549061
Change-Id: I9e418f7be67eb330b7bfaa97bbb90d0b5640469d
 2014-08-07 10:48:51 -07:00
Adam Powell
9413b245a6 Nested pre-fling for AbsListView and ScrollView 
Add nested pre-fling support to all framework widgets that currently
support nested fling.

Change-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96
 2014-08-07 10:24:04 -07:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history 
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
 2014-08-07 10:00:52 -07:00
Kenny Guy
ae267d20c6 Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 2014-08-07 09:28:12 +00:00
Kenny Guy
9962f335a1 Revert "Remove String version of getBadgedLabel" 
This reverts commit ed0096c14ae1b17845bc9bb8fbb1cdc47adfdd68.

Change-Id: If026db7e804be81aaa02cfd2a4e1a0a03ee020f1
 2014-08-07 16:48:06 +00:00
Ricardo Cervera
bdad288c96 am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '8f16c0655eb4e7321f346ed62d9068ebc9fdc35b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:13:09 +00:00
Kenny Guy
65810072d6 Remove LauncherApps method left for compat. 
Method was left while updating unbundled apps
which have now been updated.

Bug: 16864685
Change-Id: I687cb23a1b60b88eeb988f3cf2604dc24b739121
 2014-08-07 16:09:10 +00:00
Ricardo Cervera
8f16c0655e am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '35b08bacc4e4ab937a5179b5b991f6509127f517':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:07:37 +00:00
Ricardo Cervera
35b08bacc4 am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit 'edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:03:27 +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
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
Kenny Guy
4a4f275f24 Remove String version of getBadgedLabel 
It was left to allow unbundled apps time to update.

Bug: 16484455
Change-Id: Ibae2576ac7fc88000ec81c669e66536aaa2e3e79
 2014-08-07 11:28:48 +00:00
Dan Sandler
e2a8c53f3f Merge "Link to new app notification settings from the inspector." into lmp-dev 2014-08-07 09:28:12 +00:00
Dan Sandler
e9a4e90db6 Link to new app notification settings from the inspector. 
Also hide the inspector whenever the keyguard changes state,
to make sure we don't leave any notification guts lying
around when you turn the screen on and off or unlock.

Bug: 16208321
Change-Id: I47cf6a0cb82e765eb6b50984972f57616b534ed3
 2014-08-07 12:04:36 -04:00
Ricardo Cervera
edcf7c5167 Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 2014-08-06 23:54:36 +00:00
Deepanshu Gupta
4e01c59e6c am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: 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 '6ebeefa04cb3c360d8028eb77e60bacf8a800cb1':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:59:08 +00:00
Deepanshu Gupta
6ebeefa04c am 904d7711: am 7b561be3: am 09c3c2ed: 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 '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:51:47 +00:00
Deepanshu Gupta
904d77118b am 7b561be3: am 09c3c2ed: 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 '7b561be3a6fedebfce412cecd8c36d6686f6576c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:45:23 +00:00
Deepanshu Gupta
7b561be3a6 am 09c3c2ed: 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 '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:37:10 +00:00
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
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib. 
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 21:28:24 +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 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
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