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

3593 Commits

Author SHA1 Message Date
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Winson Chung
19042f10fa am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:38:45 +00:00
Christoph Studer
23867c4303 am df5eb412: am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'df5eb41241872e641a199b7089894dac5c9c358c':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:32:39 +00:00
Dianne Hackborn
102ecc0e11 am 73c10aa4: am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '73c10aa477896d0b46b223613e34781bb98589ff':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:32:33 +00:00
Christoph Studer
2a7058d18d am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'a03d8335fea5e19e56e901e15213f0db16d570b6':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:23:19 +00:00
Dianne Hackborn
93d0678e80 am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:23:14 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Dianne Hackborn
7e7f9a3f7c Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 2014-08-28 18:58:16 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
Robert Greenwalt
6afc1ac0d7 am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
  Clean up Connectivity Logging.
 2014-08-28 17:10:53 +00:00
Robert Greenwalt
c8ff9c4d9f am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
  Clean up Connectivity Logging.
 2014-08-28 16:54:42 +00:00
Robert Greenwalt
2836dbb953 Merge "Clean up Connectivity Logging." into lmp-dev 2014-08-28 16:29:55 +00:00
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
Dianne Hackborn
7d9eefd871 Fix issue #16953886: History and batterystats checkin summary... 
...start timestamps are in 1970s

Look for the wall clock time being very small, and try to update
it to a better value if we see one.

Also handle time change events to update the current time we a re
tracking.

Change-Id: Ifbae2b8c43ab5baa75ee4f672a752a542e23b52d
 2014-08-27 18:30:31 -07: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
Robert Greenwalt
fc0c6890c6 Clean up Connectivity Logging. 
bug:17285109
Change-Id: I61b98aa636996f8d4915fd954d49a22c20cfe9ab
 2014-08-27 14:49:14 -07: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