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

2803 Commits

Author SHA1 Message Date
Dongwon Kang
c6008bedc3 am 984b3948: am 56615c3e: Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 
* commit '984b39487e37b13c4b464951ded6f2739ed4a473':
  TIF: Rearchitecting TvInputPassthroughWrapperService.
 2014-08-06 01:23:58 +00:00
Craig Mautner
e9a320cf3b am 23d97bbe: am 33784085: Merge "Don\'t dismiss boot messages before keyguard is ready" into lmp-dev 
* commit '23d97bbe378efc02c06dde296bf14aff9a984357':
  Don't dismiss boot messages before keyguard is ready
 2014-08-06 00:33:11 +00:00
Amith Yamasani
d4648d2756 am a41b17ac: am 41179448: Merge "Allow phone UID to export singleton providers" into lmp-dev 
* commit 'a41b17ac15b24408a0ceb494b6ff81285977618a':
  Allow phone UID to export singleton providers
 2014-08-06 00:33:06 +00:00
Jae Seo
e360ec8587 am 808f4741: am 98846b0f: Merge "TIF: Make selected tracks identifiable" into lmp-dev 
* commit '808f474121e8ee20be674612a5aa5f6b0bac0352':
  TIF: Make selected tracks identifiable
 2014-08-05 22:26:46 +00:00
RoboErik
3b3dfcd832 am a5281929: am 23d078e3: Add display metadata and change strings to CharSequences 
* commit 'a52819294d64f8cc811c9bfed691926fd39b92eb':
  Add display metadata and change strings to CharSequences
 2014-08-05 21:41:43 +00:00
RoboErik
75847b98f3 Add display metadata and change strings to CharSequences 
This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
 2014-08-05 14:30:27 -07:00
Michael Wright
01e840ff94 Add resize method for virtual displays 
Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
 2014-08-05 21:10:03 +00:00
Amith Yamasani
f17e498fea Merge "Allow phone UID to export singleton providers" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
41c1ded7f0 Allow phone UID to export singleton providers 
Also add a user variant of replacePreferredActivity for use
by SmsApplication.

Map user restrictions for SMS/MMS to AppOps perms.

Bug: 16681533
Change-Id: I3dfed5fc754e33bb51c6f571851653a7c2770e46
 2014-08-05 14:37:27 -07:00
Brian Carlstrom
1f2375ab10 Merge "resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-08-05 00:19:02 +00:00
Michael Wright
3cb8073fbd am e94f3851: am c9938987: Add resize method for virtual displays 
* commit 'e94f3851b8356f95bc91d079e323e9ec9faa7fba':
  Add resize method for virtual displays
 2014-08-05 21:31:01 +00:00
Alex Light
69679a3712 resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp 
Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
 2014-08-05 14:25:43 -07:00
Jinsuk Kim
8a4162c9f7 am 8b0727e7: am 5f5c1abc: Merge "CEC: Make port info unmodifiable" into lmp-dev 
* commit '8b0727e723b44b246ff625b4fcc10b32680382f1':
  CEC: Make port info unmodifiable
 2014-08-05 21:16:26 +00:00
Jinsuk Kim
bbc73a442d am f2576672: am 8ac689e5: CEC: Make deviceSelect to active device a no-op 
* commit 'f257667206c529d595932bea62c42d467e63248f':
  CEC: Make deviceSelect to active device a no-op
 2014-08-05 21:16:18 +00:00
Jinsuk Kim
58500f43ec CEC: Make deviceSelect to active device a no-op 
Changing input to already the active source should return
immediately without initiating routing control. This is also required
for processing the incoming <Active Source>

Also set the flag in intent for input change to start a new
activity from a service. The service fails to launch an activity
without it.

Bug: 15570939
Change-Id: I9b20b31137dfa4dc847bc43cc7fd35e669d0dec7
 2014-08-05 21:04:44 +00:00
Jon Eklund
7cf8054ef9 am 2a3c797f: am db9e7f0a: Add support for line out audio device 
* commit '2a3c797fff5d635cf7a96be5793121a6683f45ab':
  Add support for line out audio device
 2014-08-05 20:35:43 +00:00
Jon Eklund
43cc8bbbbd Add support for line out audio device 
Change-Id: I48750511b56a2bc5f06b7bdd11cfb4e0cd2728af
 2014-08-05 20:27:40 +00:00
Jeff Sharkey
21cfc6b282 am 262667e3: am 7c1ad552: Stronger constraints around install session IDs. 
* commit '262667e39c17ee7e3d6f85de28415b5ef2e83b2a':
  Stronger constraints around install session IDs.
 2014-08-05 17:55:46 +00:00
Jeff Sharkey
f174c6e6de Stronger constraints around install session IDs. 
Generate positive, non-zero session IDs, and don't recycle them
within a given boot.  Guard against ID starvation by crazy apps.

Bug: 16792837
Change-Id: I6035afe4d942d358b5ca12b4f818c55885b74aba
 2014-08-05 17:46:05 +00:00
Nicolas Prevot
7b46efe288 am 4bdd413f: am 95559c12: Merge "Security fixes related to cross-user content." into lmp-dev 
* commit '4bdd413f301e4b79b2cb664142d34e30c5f8b350':
  Security fixes related to cross-user content.
 2014-08-05 17:20:53 +00:00
Justin Koh
e4e8e6dc0a am c33316c8: am f226c16c: Merge "Allow listeners to see children" into lmp-dev 
* commit 'c33316c89a0e6f8cd5d4ea5635eaefdb8830a3c6':
  Allow listeners to see children
 2014-08-05 17:03:43 +00:00
John Spurlock
15846bd9fc am e84cae3b: am 8c0ee727: Merge "Allow user-prioritized packages through in priority mode." into lmp-dev 
* commit 'e84cae3ba8fd65380bb89d7a812b813603afe779':
  Allow user-prioritized packages through in priority mode.
 2014-08-05 16:04:12 +00:00
Yuncheol Heo
1cad2e194a am 5ccc3603: am 4e11bf93: Refactor <Feature Abort> logic to concentrate it in one place. 
* commit '5ccc3603c8e2ef3994d351c8d207b04146c97751':
  Refactor <Feature Abort> logic to concentrate it in one place.
 2014-08-05 13:20:35 +00:00
Jungshik Jang
fb0e811e53 am 3bf4a01d: am e9436509: Fix bugs on timer recording action. 
* commit '3bf4a01d7513aa0b3b0c47476d05ce9ba66b7aa8':
  Fix bugs on timer recording action.
 2014-08-05 13:20:22 +00:00
Tadashi G. Takaoka
7b1195d416 am 184dadef: am a854e53f: Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 
* commit '184dadef6e2b9e3ea827bfc54015a2560faa4421':
  Fix unnecessarily non-static inner class to static inner
 2014-08-05 13:20:14 +00:00
Wonsik Kim
4dfe1efe7f am 3a1a0f23: am 520d746b: Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev 
* commit '3a1a0f23b6fcae3f75d84b97fef2758ac6ca83c8':
  TIF: fix JTvInputHal::removeStream issue
 2014-08-05 13:20:08 +00:00
Wonsik Kim
1c6c74c7ee am 7dbde80e: am e26f6f16: Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 
* commit '7dbde80e4cc34a1a1f9df35c31f2e7ef3ea37be9':
  TIF: implement setVolume for hardware inputs
 2014-08-05 13:20:00 +00:00
Yuncheol Heo
6aae6528a6 Refactor <Feature Abort> logic to concentrate it in one place. 
- Don't reply from the unregistered address.
- Use "unrecognized opcode" as the default reason.

Bug: 16799466, Bug: 16798785
Change-Id: I7c2ece6436f7ebd59986d2baf4f45cd86e6622d9
 2014-08-05 18:17:45 +09:00
Jungshik Jang
faa49bc896 Fix bugs on timer recording action. 
1. Apply masking to feature abort of SetXXXTimer
2. Announce error when failed to send SetXXXTimer.
3. Remove TimerRecordingAction when deivce is disabled.
4. Report clear timer record error thru onClearTimerRecordingResult.

Change-Id: Id243aa25481dad57509b4229ca214fa9b6b00fdc
 2014-08-05 17:24:39 +09:00
Yuncheol Heo
815ee1bc3f am b5984269: am 8ce97924: Let STB oneTouchPlay on SCREEN_ON event. 
* commit 'b5984269eaf605a659e15f168ca47e1251eef212':
  Let STB oneTouchPlay on SCREEN_ON event.
 2014-08-05 02:41:49 +00:00
Yuncheol Heo
fc44e4e03c Let STB oneTouchPlay on SCREEN_ON event. 
- Eleborate the reason code to initiate the initialization.

Bug: 16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
 2014-08-05 11:15:59 +09:00
Jungshik Jang
4bf30389bf am 1bc420cd: am 70ac06d8: Merge "Implement clear timer." into lmp-dev 
* commit '1bc420cd8fcf7940a3467db4fee330fbbab84c00':
  Implement clear timer.
 2014-08-05 00:41:15 +00:00
John Spurlock
6ac5f8df62 Allow user-prioritized packages through in priority mode. 
Bug:16396715
Change-Id: I115d717e5c25500407d4f7876f070a1497fb2887
 2014-08-05 09:58:19 -04:00
Justin Koh
106c16fbd9 Merge "Allow listeners to see children" into lmp-dev 2014-08-05 00:34:22 +00:00
Justin Koh
8d11a5aa2d Allow listeners to see children 
Allow listeners to see notification children. Since L is not baked yet, keeping
this version check makes it difficult to test apps.

Bug: 16733244
Change-Id: I70afd6b99fc18c1f0b9188279c04fab80c37d414
 2014-08-04 18:31:26 -07:00
Nicolas Prevot
504d78ea10 Security fixes related to cross-user content. 
Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.

BUG: 16779492

Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
 2014-08-05 17:05:09 +00:00
Dongwon Kang
e377ea5de6 Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 2014-08-05 00:07:36 +00:00
Wonsik Kim
ee3166e0d5 Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 2014-08-05 00:07:36 +00:00
Wonsik Kim
8e45a33ca8 TIF: implement setVolume for hardware inputs 
Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
 2014-08-05 10:33:08 +09:00
Jason Monk
c514fec5e5 am c262a96f: am f28bbfdb: When exiting lock task require authentication 
* commit 'c262a96f9316e0232c4995457fa3162d8fa1bca1':
  When exiting lock task require authentication
 2014-08-04 23:59:44 +00:00
Jinsuk Kim
30c74d9ba6 CEC: Make port info unmodifiable 
Puts HDMI port information behind unmodifiable type. This helps API make use
of port-related information without having to switch to service thread.
See getActiveSource().

Added the unmodifiable version of SparseArray/SparseIntArray.

Change-Id: Idcf05d1d6e19b47c91a7e89a920abccc607a3eb5
 2014-08-05 21:05:16 +00:00
Tadashi G. Takaoka
0081e911a2 Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka
8c6d477d30 Fix unnecessarily non-static inner class to static inner 
Change-Id: I0c8efda6ef0bede6b5871cd651f42db82dbfbd39
 2014-08-05 07:31:22 +00:00
Wonsik Kim
b82de3600f TIF: fix JTvInputHal::removeStream issue 
Bug: 16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
 2014-08-05 07:30:51 +00:00
Jungshik Jang
4f9e21ee32 Merge "Implement clear timer." into lmp-dev 2014-08-04 23:56:40 +00:00
Jungshik Jang
e5a9337ebe Implement clear timer. 
This change implements clear timer, which sends
<Clear xxx Timer> to recorder, and reponse of it,
<Timer Cleared Status>.
Along with it, add result parser for [Timer Status Data].

Bug: 16160962

Change-Id: I1f48ec055aa93dc836156525de8b7ef921aad8b5
 2014-08-05 09:32:34 +09:00
Jason Monk
e069779dea When exiting lock task require authentication 
When exiting lock task with screen locking on make sure to notify
that the credentials need to be entered again.

Bug: 16496374
Change-Id: I891a8a8a04a67aa70eba8ea78bd585ad0dd17808
 2014-08-04 23:50:06 +00:00
Craig Mautner
acf93fefb1 Merge "Don't dismiss boot messages before keyguard is ready" into lmp-dev 2014-08-04 23:47:20 +00:00
Craig Mautner
a631d49e05 Don't dismiss boot messages before keyguard is ready 
Or you will expose the home screen.

Fixes bug 16371571.

Change-Id: Ib38a583189c570b44910548a9544b1e81c831119
 2014-08-05 23:04:42 +00:00
Jae Seo
dfab517fb2 Merge "TIF: Make selected tracks identifiable" into lmp-dev 2014-08-04 23:42:57 +00:00