17615 Commits

Author SHA1 Message Date
Adam Connors
1a910ef2b4 Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
2014-06-05 12:02:04 +01:00
destradaa
919902a0de Merge "Re-work the initialization of FLP HAL to make isSupported() static. b/14839888" 2014-06-03 20:34:11 +00:00
Michael Kolb
9a7a805124 am a4f593d7: am 576a0d14: Merge "Fix circular mask" into klp-modular-dev
* commit 'a4f593d7fb205b56412e3091fb21c592abe934cf':
  Fix circular mask
2014-06-03 18:14:00 +00:00
destradaa
5ce66d8dcc Re-work the initialization of FLP HAL to make isSupported() static.
b/14839888

Change-Id: Ib5973586fd8a2d4a1e5fd09cf82dd4f4493398d0
2014-06-03 11:09:00 -07:00
Michael Kolb
a4f593d7fb am 576a0d14: Merge "Fix circular mask" into klp-modular-dev
* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask
2014-06-03 18:06:25 +00:00
Jae Seo
2e0bacc2a3 am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
  TvContract: Address the feedback from the API review
2014-06-03 17:17:00 +00:00
Sungsoo Lim
8d2d5c8d5c am 61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev
* commit '61e4b1cf302ea659329952dfcebffb2f387bff3f':
  Add ClientState for handling the crash of clients.
2014-06-03 17:16:49 +00:00
Chulwoo Lee
f573765bf1 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
  Add a way to get the class name of SetupActivity and SettingsActivity
2014-06-03 17:16:33 +00:00
Dianne Hackborn
bcaffd0586 am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev
* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
  Some battery stats history fixes.
2014-06-03 17:16:01 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Narayan Kamath
c32a244e90 am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
  Scan for renderscript files before deciding ABIs.
2014-06-03 13:58:35 +00:00
Narayan Kamath
522a027806 am 41aa48be: am 032c5c05: Merge "Log process abis during start."
* commit '41aa48beacc93a1511a290e91293402eeb787165':
  Log process abis during start.
2014-06-03 13:29:04 +00:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
2014-06-03 13:24:45 +00:00
Narayan Kamath
41aa48beac am 032c5c05: Merge "Log process abis during start."
* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.
2014-06-03 13:24:34 +00:00
Narayan Kamath
dad8f819a7 Merge "Add an --abi argument to "pm install"" 2014-06-03 12:01:53 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs.
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
2014-06-03 12:58:35 +01:00
Lorenzo Colitti
e4d7fc02ab Merge "Fix Legacy NetworkInfo API" 2014-06-03 11:58:24 +00:00
Robert Greenwalt
b90b20b5d5 Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
2014-06-03 19:58:54 +09:00
Narayan Kamath
116bdbd823 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd420536aaa9d93ae510a3151ccc4df1d)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
2014-06-03 11:35:49 +01:00
Yuncheol Heo
71b197a0a3 Merge "Add SystemAudioAction(FromAvr|FromTv)." 2014-06-03 10:12:53 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
2014-06-03 11:11:47 +01:00
Yuncheol Heo
63a2e0696c Add SystemAudioAction(FromAvr|FromTv).
The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.

This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
  utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
  from removing the caller itself.

Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298
2014-06-03 19:09:44 +09:00
Narayan Kamath
032c5c054c Merge "Log process abis during start." 2014-06-03 09:57:03 +00:00
Christopher Tate
bfb131317b Merge "Add full-backup stream API to BackupTransport" 2014-06-03 02:07:01 +00:00
Christopher Tate
4dd2635bf5 Add full-backup stream API to BackupTransport
Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.

The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.

Bug 15329632

Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a
2014-06-02 18:57:21 -07:00
Robert Greenwalt
9e32be5d26 Merge "Refactor NetworkFactory." 2014-06-03 01:11:00 +00:00
Jae Seo
6fbe3982b0 Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev 2014-06-03 00:26:05 +00:00
Sungsoo Lim
5a26f00c84 Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev 2014-06-03 00:23:09 +00:00
Sungsoo Lim
72ad7bf915 Add ClientState for handling the crash of clients.
Bug: 15054040
Change-Id: I4dd8d1c350186fe705daa20c9944bc8e4dd556c2
2014-06-03 09:09:14 +09:00
Chulwoo Lee
e7bb7d6bb2 Add a way to get the class name of SetupActivity and SettingsActivity
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
2014-06-03 08:56:35 +09:00
Yuhao Zheng
cfdecb3b91 Merge "WifiService and WifiPasspointService hook up" 2014-06-02 23:54:11 +00:00
Yuhao Zheng
daa618e3cd WifiService and WifiPasspointService hook up
- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
2014-06-02 16:48:37 -07:00
Jae Seo
bd23fa0ba1 TvContract: Address the feedback from the API review
This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
  indicate data is internal to the provider that inserted it, and should
  not be decoded by other apps. It would be nice to restrict read access
  to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
  questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
  conventions: "vnd.android.cursor.dir/channel",
  "vnd.android.cursor.dir/program", etc. (Notice singular tense and no
  package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
  with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
  to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
  (from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
  standard). Define a subclass with the Android canonical genres, which
  are simple strings that are comma-separated when inserted into
  COLUMN_CANONICAL_GENRE.

Bug: 15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
2014-06-02 16:44:37 -07:00
Robert Greenwalt
3192dec321 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
2014-06-02 16:19:08 -07:00
Robert Greenwalt
8f3799867d Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +00:00
Dianne Hackborn
0bec638839 Merge "Some battery stats history fixes." into lmp-preview-dev 2014-06-02 22:57:41 +00:00
Craig Mautner
8d2a604ce4 am 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev
* commit '39317b9742cf796557583f6678a7443a991414f7':
  Compare task userId with userId profiles.
2014-06-02 22:10:30 +00:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Craig Mautner
481acb86e4 Merge "Compare task userId with userId profiles." into lmp-preview-dev 2014-06-02 20:40:16 +00:00
Dianne Hackborn
fc0641340f Some battery stats history fixes.
- Now the full wake history uses the history tag if it can.
  Hopefully this will still result in a consistent history,
  since that isn't really want the tag is for...  but the
  current implementation in places will probably make this work.

- Possibly fix a bug with inconsistent state between partial
  history snapshots: after a snapshot is printed, don't allow
  any more batching into the most recent history entry, so the
  next snapshot will not miss anything that might get placed
  into it soon after.

Also rework command line arguments for enable/disable to make these
commands instead of options.

Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
2014-06-02 12:42:12 -07:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
RoboErik
830fd7036e am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev
* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
  Minimum work to make volume handling work with sessions
2014-06-02 17:15:14 +00:00
Craig Mautner
e0d50cc15b Compare task userId with userId profiles.
Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b
2014-06-02 10:11:53 -07:00
RoboErik
e78755e180 Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 2014-06-02 17:10:07 +00:00
Nicolas Prevot
f3bbf2b801 Merge "Small fix related to cross-profile result intents." 2014-06-02 16:38:03 +00:00
Nicolas Prevot
6b942b8c52 Small fix related to cross-profile result intents.
Change-Id: Id99d6406cdd8ceddacf6fee0cf66e7e59d749a15
2014-06-02 15:20:42 +01:00
Florin Malita
9ec2eabe5a Merge "Add a native Canvas wrapper." 2014-06-02 13:37:11 +00:00
Amith Yamasani
dc31af2d4f Merge "Handle saving and restoring ints in application restrictions" 2014-06-02 03:18:46 +00:00
Amith Yamasani
5b5aa4072f Handle saving and restoring ints in application restrictions
Unit tests for restrictions types and proper escaping.

Change-Id: Iac35521faf5798398a89fecbad82fcdd256a4146
2014-06-01 20:17:37 -07:00