19242 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
Svetoslav
1613081477 am 37c40828: am 8cd27c3c: Allow adding widgets from user profiles.
* commit '37c408288951755c46c3cdf9920dec2018a502a6':
  Allow adding widgets from user profiles.
2014-08-05 21:08:21 +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
Svetoslav
976e8bd201 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-05 20:57:20 +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
Michael Wright
f6982378f1 am a95bae94: am c241724e: Ensure backup schedule file is closed.
* commit 'a95bae941cbab351dad6c2b4f0d282e86d0979d6':
  Ensure backup schedule file is closed.
2014-08-05 20:08:06 +00:00
Eric Laurent
9216b2f4f1 am 238de6e0: am 7b8c0c55: Merge "SoundTrigger API update." into lmp-dev
* commit '238de6e0b4b30be848cde7ed8f8fe903461c1689':
  SoundTrigger API update.
2014-08-05 20:03:53 +00:00
Michael Wright
46db93404b Ensure backup schedule file is closed.
Change-Id: Ie4a62cda74815c67c62fb08e8df25a71d6102d4c
2014-08-05 19:58:27 +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
Brian Carlstrom
37651b6061 am 8b8c718c: Merge "Make system use patchoat to relocate during runtime."
* commit '8b8c718cbb4ac8d2e6210567d9b6097f428be222':
  Make system use patchoat to relocate during runtime.
2014-08-05 17:51:09 +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
Svet Ganov
2b1b5b34cf am cd93451f: am 3fc2e408: Fix cross-user permission checks in print manager service.
* commit 'cd93451ff50ba63c422f9b19af2a0d35e35a7bc6':
  Fix cross-user permission checks in print manager service.
2014-08-05 17:16:29 +00:00
Svet Ganov
194db6ad91 Fix cross-user permission checks in print manager service.
The cross-user check was requesting both interact across users and
interact across users all permissions which is too restrictive. Each
one is sufficient. Further, if the app has one of these premissions
but specifies a given user not current or current-self, the code
was throwing while the correct actions is to return the requested
user id as we alreay vetted the caller's permissions.

bug:16398152

Change-Id: I1a4863eb7b05dababb66bac6e143b78dfad42b81
2014-08-05 17:06:07 +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
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00: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
Alex Light
1995d12d26 Make system use patchoat to relocate during runtime.
Make PackageManagerService aware of patchoat and make it use it when
appropriate.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Nicolas Prevot
fda7e2ae83 Merge "Security fixes related to cross-user content." into lmp-dev 2014-08-05 00:15:52 +00: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