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

3577 Commits

Author SHA1 Message Date
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
73f61292ad am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit 'e1c0d6f0a03b09debe9a0b5e735f368ea1eceef2':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 05:14:05 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Jinsuk Kim
da1fa7bcaa am 90b50ad5: am 58afc5c4: am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 
* commit '90b50ad5fef035cc83da8ecb9dde6249b9db5064':
  CEC: return non-null MHL controller when not ready
 2014-08-28 04:17:27 +00:00
Dongwon Kang
d170d13d99 am fbca19aa: am 4146f007: am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit 'fbca19aa212fd6aca7ec4c8412cb6d8f3c34757f':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 04:17:11 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 04:17:06 +00:00
Jinsuk Kim
4fe8a815e6 am 58afc5c4: am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 
* commit '58afc5c4ce6d1538028b26a32d97187cc83414ff':
  CEC: return non-null MHL controller when not ready
 2014-08-28 03:38:38 +00:00
Dongwon Kang
b266bdcca0 am 4146f007: am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit '4146f007d65d52f75ce7781562747d2c15a892f1':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 03:38:06 +00:00
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 03:38:00 +00:00
Jinsuk Kim
af410a5145 Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 2014-08-28 00:59:03 +00:00
Dongwon Kang
162fa7f41b Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 2014-08-28 00:00:58 +00:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY 
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
 2014-08-27 15:37:27 -07:00
Sascha Prueter
a82bdcb4e9 am afa64d80: am a64ecf44: am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit 'afa64d802f460a6c25c71694e7004b8b64101358':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:51:46 +00:00
Sascha Prueter
e6295fdb30 am a64ecf44: am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit 'a64ecf44914f8654cf983cde4298df283ccf8f15':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:43:47 +00:00
Sascha Prueter
b655e756a0 Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 2014-08-27 21:18:34 +00:00
Craig Mautner
53dc7eac05 Add null check to cleanupRecentTasksLocked. 
If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.

Fixes bug 17300409.

Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
 2014-08-27 14:01:25 -07:00
Jeff Sharkey
045a7a9b89 am 22f9b2a9: am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '22f9b2a9d1256f0ea397f12b4e3095fddcf4da7d':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:30:40 +00:00
Jeff Sharkey
71629cd9d0 am 3b7af7c4: am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '3b7af7c4ec06d73c9a22c96cb8f78a71f7e67b73':
  Clear pending operation flag when move failed.
 2014-08-27 18:30:30 +00:00
Jeff Sharkey
b80fa969e6 am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '542a77966963147f7b8d4705275628737fa176a0':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:21:48 +00:00
Jeff Sharkey
5bb8bc4754 am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit 'bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
  Clear pending operation flag when move failed.
 2014-08-27 18:21:43 +00:00
Amith Yamasani
61819d4552 am 22a11865: am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '22a11865cd6b6aa211217cec070343ad69ffc9a8':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:17:55 +00:00
Craig Mautner
8c458e2f95 am 273355f2: am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit '273355f25f7adb4b4302bdf2bccb04fc49ded9a3':
  Revert "Debug for 13924095."
 2014-08-27 18:08:09 +00:00
Amith Yamasani
1c9a6a965c am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '8f3e59d674c1766e1566f7b28ebbe175aacdc19e':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:07:42 +00:00
Jeff Sharkey
a9bdc43ec2 Merge "Recreate lib symlink after deleting app data." into lmp-dev 2014-08-27 17:58:38 +00:00
Jeff Sharkey
d1caf731e4 Merge "Clear pending operation flag when move failed." into lmp-dev 2014-08-27 17:58:17 +00:00
Craig Mautner
5f713a86cb am 083f3569: am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit '083f3569b15b519058e9a136b3680eff673184b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:55:40 +00:00
Craig Mautner
093d4cf542 am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'ece9e05dd4b36ca8eafbbea4c875de84c5c79695':
  Revert "Debug for 13924095."
 2014-08-27 17:55:35 +00:00
Jeff Sharkey
c521221740 Recreate lib symlink after deleting app data. 
Bug: 16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
 2014-08-27 10:47:19 -07:00
Amith Yamasani
032402cff1 Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 2014-08-27 17:39:29 +00:00
Craig Mautner
fb3fdb9495 am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'f9af796e5ae81a7eb7775d36d6f8278af0fa9920':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:38:50 +00:00
Amith Yamasani
e084039dd2 Fix incorrect reading of multichoice app restrictions 
Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
 2014-08-27 10:33:17 -07:00
Craig Mautner
d4b325a82b Merge "Revert "Debug for 13924095."" into lmp-dev 2014-08-27 17:29:58 +00:00
Jeff Sharkey
1c9edafef8 Clear pending operation flag when move failed. 
Bug: 17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
 2014-08-27 10:24:59 -07:00
Craig Mautner
d266368435 Merge "When adding an apptoken skip over removed ones." into lmp-dev 2014-08-27 17:14:18 +00:00
Craig Mautner
4e1b6a4e59 Revert "Debug for 13924095." 
This reverts commit 76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.

Logspam no longer useful, just annoying now.

Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
 2014-08-27 10:07:55 -07:00
Jorim Jaggi
2d33b1f630 am 925aedb0: am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '925aedb08fcf81994e95424144744feadd5097a7':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 17:06:09 +00:00
Craig Mautner
01f79cf916 When adding an apptoken skip over removed ones. 
App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.

Fixes bug 15751591.

Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
 2014-08-27 09:56:02 -07:00
Jorim Jaggi
339878e1a5 am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '3d9509d3bc6409a5600d23e1ded2eaa431c0cad9':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 15:28:28 +00:00
Jorim Jaggi
4c499be0ed Fix that Keyguard didn't always get onActivityDrawn call 
Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
 2014-08-27 16:50:49 +02:00
Dongwon Kang
f7f49ddade TIF: fix callback cleanup logic in removeSessionStateLocked(). 
Adding DeathRecipient to callback instance is enough. removeSessionStateLocked()
can be called in normal session release case, and the current logic will remove
valid callback instances.
Also, ConcurrentModificationException in abortPendingCreateSessionRequestsLocked()
is fixed.

Bug: 17212681
Change-Id: I42cacfa33086bf9182b061553ff52c0e25d94d9b
 2014-08-27 21:02:29 +09:00
Jungshik Jang
2df55899a3 am aa587352: am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit 'aa5873521ae4a7c38aa4fcab9ebd98e4ec32c37e':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 10:01:32 +00:00
Jungshik Jang
81cd65b8b4 am a30e6514: am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit 'a30e6514c88c501590c92e19c5cd9447fb2ba8e8':
  Add more debug message to HdmiControlService
 2014-08-27 09:48:26 +00:00
Russell Brenner
b95cef8ac0 am c9c663d3: am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c9c663d31884f85bbe14a1505051836288b517fb':
  Print services setting changes not handled for managed profiles.
 2014-08-27 09:48:19 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00:00
Jungshik Jang
493ecb1dcd am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit 'd2560b289b4a18f7a4b8aeabb0a30d298a6b21d9':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 09:22:47 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +00:00
Jungshik Jang
473119fdc3 Allow broadcast for <Set System Audio Mode>. 
AVR may broadcst <Set System Audio Mode> to start system audio mode.
But we do handle direct message case.

Bug: 17292360
Change-Id: I9111f8122d58b31f3801e4e78f283db65e79330b
 2014-08-27 16:43:22 +09:00
Jungshik Jang
6421dfc9d1 am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit '927f0b6594d4c806e830cb60684e88e41990e97d':
  Add more debug message to HdmiControlService
 2014-08-27 06:59:01 +00:00
Jungshik Jang
038c8601c3 Merge "Add more debug message to HdmiControlService" into lmp-dev 2014-08-27 06:39:58 +00:00