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

2403 Commits

Author SHA1 Message Date
Ji-Hwan Lee
24445f62f8 am 8207fa19: am f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev 
* commit '8207fa194b9f0e2c126b7ee3978d34ba6ca15192':
  TIF: Fix crash on setMainSession
 2014-07-24 19:49:07 +00:00
Ji-Hwan Lee
b398259496 am 1bcb91c1: am 22185ce0: TIF: Support HDMI-CEC active source management 
* commit '1bcb91c19bfdc166ff4cacc1dc1569da5416b3fa':
  TIF: Support HDMI-CEC active source management
 2014-07-24 19:48:59 +00:00
Terry Heo
b4862fa742 am 6933e350: am f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev 
* commit '6933e350e6eb1f866578e1f588284706b3401894':
  TIF: Enable capturing TV input of TvInputPassthroughWrapperService
 2014-07-24 19:48:55 +00:00
Antoine Labour
6e753f8087 am f6ec140a: am 4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev 
* commit 'f6ec140ad67263061c6c9236e1c117c75c1a6dc0':
  WindowManager: fix clipping
 2014-07-24 19:48:50 +00:00
Jungshik Jang
a81ca12dc3 am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record. 
* commit '13dcf17a859bb88569dc93287d69054d213a3e89':
  Implement OneTouchRecordAction and stop one touch record.
 2014-07-24 19:48:03 +00:00
Terry Heo
8934fd5d64 am 5d41a6b0: am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev 
* commit '5d41a6b0ca5f44d7eeca9d853a468a3a899f0c49':
  Add a frame capture API of TV input
 2014-07-24 19:47:35 +00:00
Geoffrey Borggaard
832f82f9eb am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 
* commit '1b09c716096ccada799c6fde6cb397b3e307b709':
  Fixes setting password through DevicePolicyManager
 2014-07-24 19:46:46 +00:00
Matthew Williams
7d1081531d am 083e4b24: am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev 
* commit '083e4b24c978e380e6a7c864a00257f585eb51c7':
  Fix JobScheduler race condition
 2014-07-24 19:46:20 +00:00
Ji-Hwan Lee
4c52697dbe TIF: Support HDMI-CEC active source management 
Add system API TvView.setMain() and TvInputService.onSetMain().

Bug: 15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639
 2014-07-24 15:07:43 +09:00
Jungshik Jang
b6591b8e53 Implement OneTouchRecordAction and stop one touch record. 
In addition to it, add api for clearTimerRecording as well.
Separately, I will replace logic for notifying message with callback
interface.

Bug: 16160962

Change-Id: I2368f7c697eb44ed4542c0ec4412c63a6ae41a5c
 2014-07-24 11:11:38 +09:00
destradaa
7c469f1aec am 32acd391: am 87a50e32: Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev 
* commit '32acd391035535ccec902458befd5353e7d1ec4b':
  Expose Gps Navigation Messages in the platform. b/16405976
 2014-07-23 21:55:38 +00:00
Jeff Sharkey
ff33a988dd am af043268: am 7bf4f48f: Remove APK observers. 
* commit 'af043268f0f27620be25de18109c7e1ba691906f':
  Remove APK observers.
 2014-07-23 20:33:16 +00:00
Jeff Sharkey
84e71d1d61 Remove APK observers. 
Most app installations have migrated to the new cluster-style layout
where each app is placed in a unique directory.  There are now two
general issues with these observers:

We can't know when a push/sync has finished delivering all splits
for an app.  Also, inotify isn't recursive, so we'd have to manage
watches for each app directory.

Change-Id: I3770fa9059ddf80f933a3804714f2e52591fce49
 2014-07-23 20:25:24 +00:00
Gabriel Peal
e3daa56441 am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* commit '6aac8cf7bccf5ab47b89fa69d9963c123701bcbb':
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 20:12:47 +00:00
Robert Greenwalt
22aab81e2c am 819917e3: am dc9d7aa7: Merge "Reenable logging." into lmp-dev 
* commit '819917e3eb54dacba025c8516ed7d8b5eeaf419b':
  Reenable logging.
 2014-07-23 19:53:51 +00:00
Terry Heo
a8177c8879 Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev 2014-07-23 19:35:21 +00:00
Terry Heo
79124a717c TIF: Enable capturing TV input of TvInputPassthroughWrapperService 
Also fixed usage of Log.e() in TvInputService to show stack trace.

Bug: 16441553
Change-Id: I5c160de4a628698907ffd00510d982d597c0ea01
 2014-07-24 10:51:23 +09:00
Ji-Hwan Lee
982abe693f TIF: Fix crash on setMainSession 
Change-Id: Iddf5032a99dbf855e418448b39ba66a68be8b07c
 2014-07-24 17:11:03 +09:00
Terry Heo
c086a3df3b Add a frame capture API of TV input 
- Added new permission CAPTURE_TV_INPUT

Bug: 15736756
Change-Id: I2ae8b2e3f5b1ad1d525854ed89ab2043cf66acbe
 2014-07-24 10:08:45 +09:00
Craig Mautner
699a295bb8 am 41505285: am 59f55203: Disable back button goes to recents behavior 
* commit '41505285136f349f281df0dade79f17b353971ff':
  Disable back button goes to recents behavior
 2014-07-23 19:19:38 +00:00
Craig Mautner
0b633fc121 Disable back button goes to recents behavior 
Using a static final boolean to do this so if policy is changed it
can be enabled easily.

Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.

Fixes bug 16512561.

Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
 2014-07-23 18:58:08 +00:00
Jason Monk
a979c5573b am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev 
* commit '01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
  Make the 'locked' lock task not lock keyguard on exit
 2014-07-23 18:56:27 +00:00
Antoine Labour
7699651ec4 Merge "WindowManager: fix clipping" into lmp-dev 2014-07-23 18:56:15 +00:00
Antoine Labour
7db8687d57 WindowManager: fix clipping 
The animation code has some logic to avoid committing a new clip rect
when it hasn't changed. However, when we destroy the SurfaceControl and
recreate it later, we failed to reset the cached value, so if the clip
rect hasn't changed, we never set it on the new SurfaceControl.

This patch resets the cached value when creating the SurfaceControl.

Change-Id: I355576709834dd80994c7564330a234b182800e6
 2014-07-23 21:15:48 -07:00
Gabriel Peal
b8cb6518d8 Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* changes:
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 18:56:15 +00:00
destradaa
ec80cd8e7c Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev 2014-07-23 18:50:38 +00:00
Robert Greenwalt
c827f813e1 Merge "Reenable logging." into lmp-dev 2014-07-23 18:50:38 +00:00
Robert Greenwalt
a7d31bf307 Reenable logging. 
ConnectivityService has been rewritten for L and is in a stabilizing period.
We need the logging to track down bugs people report.
Restoring to Pre-L conditions.

If there's excess logging please report it - it probably indicates a bug.

Change-Id: I7baf891e3bf12e1545afeb92b8d5af0b01e12a7b
 2014-07-23 12:42:47 -07:00
Gabriel Peal
f364f94496 Added Action to PlaybackState 
Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
 2014-07-23 11:45:03 -07:00
Gabriel Peal
f0593bc17b Added QueueState, playUri, and playFromSearch. 
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
 2014-07-23 11:45:03 -07:00
Jason Monk
8ed4d5ac66 Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev 2014-07-23 18:38:23 +00:00
Jeff Davidson
44e2be10f6 am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
  Implement VpnService.setBlocking().
 2014-07-23 18:28:08 +00:00
Geoffrey Borggaard
7968b28ad8 Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 2014-07-23 18:25:52 +00:00
Geoffrey Borggaard
987672d262 Fixes setting password through DevicePolicyManager 
LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug: 16204999

Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
 2014-07-23 20:03:51 +00:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking(). 
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
 2014-07-23 11:18:57 -07:00
Matthew Williams
01ac45b6ff Fix JobScheduler race condition 
The loading of jobs from disk is now done sychronously.

Bug: 16372824
Change-Id: Ica0592d6de51e89662c9e49ed1eb59209b64356c
 2014-07-23 15:33:09 -07:00
Jason Monk
2961ce599e Make the 'locked' lock task not lock keyguard on exit 
While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.

Bug: 16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
 2014-07-23 17:33:13 +00:00
destradaa
4b3e393127 Expose Gps Navigation Messages in the platform. 
b/16405976

Change-Id: Ic982ea2467d116585780c20c2fa7e974e50f8345
 2014-07-23 10:30:21 -07:00
RoboErik
397beaf432 am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '67430c74d436e58d92b0d53ffdca1de5ded20c58':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:20:01 +00:00
Dianne Hackborn
bfa2253e4b am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:12:01 +00:00
Sander Alewijnse
8e1a01a49c am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'ce1088a641b0027df04e3388a73423294262d547':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:11:57 +00:00
RoboErik
9db9bf7034 Switch Session APIs over to AudioAttributes 
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
 2014-07-23 17:08:32 +00:00
Chris Wren
941d57ad86 am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:28:54 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Chris Wren
9246171277 am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 12:59:09 +00:00
Chris Wren
636f360ba5 am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
  Honor the sort and group keys for notification ranking.
 2014-07-23 12:59:01 +00:00
Nicolas Prevot
2a9844c5cc am b5b6f33e: am ea6f0c52: Fixing cross-user content. 
* commit 'b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
  Fixing cross-user content.
 2014-07-23 12:58:43 +00:00
Jungshik Jang
cfd1fa6357 am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 12:58:38 +00:00
Youngsang Cho
74065729c4 am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs 
* commit '5b0fca67b75204fb886e541719e6f049ed932dc5':
  Block logging watched histories for passthrough inputs
 2014-07-23 12:58:34 +00:00
Chris Wren
4a24fd3c7b Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Bug: 15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
 2014-07-23 10:36:57 +00:00