5776 Commits

Author SHA1 Message Date
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet.
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
2014-08-19 16:43:06 +00:00
Ihab Awad
9e4329ea0b Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev 2014-08-19 15:47:37 +00:00
Ihab Awad
6107bab041 ConnectionService API has only one completed callback (1/3)
Refactor ConnectionService API so it has only one "completed"
callback, and connection state and failure codes indicates what
happened. Previous design where we had separate callbacks for failure,
cancellation and success was error prone because it was easy to forget
to implement one of them.

Bug: 16993846
Bug: 17070939

Change-Id: I84bf5d041cf78193ccf80db201b08db3b7014830
2014-08-19 10:51:00 -07:00
Kenny Guy
1b2a5365fc am c50a86f2: am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev
* commit 'c50a86f22df34a46df52dc93699c7d46c376e05b':
  First part of renaming methods in LauncherApps.
2014-08-19 11:30:52 +00:00
Yorke Lee
38dd601d0a Merge "Make AudioState modes static constants" into lmp-dev 2014-08-19 02:43:23 +00:00
Yorke Lee
1426048bd3 Make AudioState modes static constants
This enables the ability to use them in switch statements

Bug: 17161247
Change-Id: Iee3da676f2cd52a09d36b58da4ba4640bd8998c5
2014-08-20 16:38:45 -07:00
Jeff Sharkey
ed118e1e9f Merge "More progress towards split APKs in ASECs." into lmp-dev 2014-08-19 02:43:23 +00:00
Jeff Sharkey
bb7b7bea19 More progress towards split APKs in ASECs.
Teach DefaultContainerService to install split APKs, which will be
needed when moving to/from ASECs.  Also support forward locking for
testing purposes, even though its deprecated.

Move native library unpacking code to NativeLibraryHelper location
where it can be shared by both DCS and PMS.  Also update footprint
calculation logic to mirror the later unpack codepaths.

Immediately persist sealed sessions.  When resolving install
locations, prefer location of any existing install of that
package.  Lightweight parse requesting certificates now always
verifies that all contents are signed correctly.

Bug: 16514385
Change-Id: Ida1c4eb0f95b065104dd971e19126d4085ebf1f0
2014-08-20 12:47:27 -07:00
RoboErik
47a7d247ef Merge "Api updates to MediaSession components" into lmp-dev 2014-08-19 02:43:23 +00:00
RoboErik
d2b8c947dd Api updates to MediaSession components
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07:00
vandwalle
da3475dba7 Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 2014-08-20 16:06:26 +00:00
Adam Powell
75d6bc1aee Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev 2014-08-19 02:43:23 +00:00
Adam Powell
2c818ca0a5 Make Toolbars (and Toolbar-based ActionBars) have constant text size
Bug 16397655

Change-Id: I908feb1c0a44e4d6061ed49a81c326c841bb2e7c
2014-08-19 11:11:42 -07:00
Shishir Agrawal
a34bdb18c5 Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 2014-08-19 02:43:23 +00:00
vandwalle
1575d90605 remove passpoint, except ANQP - DO NOT MERGE
This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
2014-08-19 01:54:41 +00:00
destradaa
c8cd5d6c04 am fa1358ad: am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev
* commit 'fa1358adff52baecd0c3e1aad933e5de614073a2':
  Add @SystemApi annotation to Geofence Hardware types.
2014-08-19 00:17:36 +00:00
Jeff Sharkey
942fc9d817 am 1171ce11: am 442dcce1: am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev
* commit '1171ce11a3dc625f66a74ff5979db51c5d9cb58b':
  Progress towards staging ASECs.
2014-08-18 23:25:13 +00:00
Kenny Guy
545de86fca Merge "First part of renaming methods in LauncherApps." into lmp-dev 2014-08-16 04:29:45 +00:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE)
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2014-08-19 20:08:52 -07:00
destradaa
2d86b70cf3 Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 2014-08-16 04:03:42 +00:00
destradaa
c4e1e59561 Add @SystemApi annotation to Geofence Hardware types.
b/17008446

Change-Id: Id3f92dd03309324d3343c87da8c3e30733d06a64
2014-08-18 10:22:23 -07:00
Nicolas Prévot
b8b6d7ea37 am fa836822: am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev
* commit 'fa83682209a7f2d49736ade3fab63be7ffb0b37e':
  Revert "Adding the requiredForProfile flag."
2014-08-18 19:41:57 +00:00
Lenka Trochtova
1e0c91aa72 am 98fa98e6: am b32505ed: am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
* commit '98fa98e6c0ae549dc109fa6b924446b8321b45a5':
  Make AudioState constructors public
2014-08-18 19:41:06 +00:00
Santos Cordon
aee7d1a71b am 3f1ff88e: am d2b3eeff: am ac0a6e48: Update conference call APIs.
* commit '3f1ff88eb49e3ab3704790feb172323c21fe0cd3':
  Update conference call APIs.
2014-08-18 19:40:53 +00:00
Santos Cordon
823fd3c79d Update conference call APIs.
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
2014-08-18 17:30:58 +00:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
Michael Wright
16e6811deb am 0ad986bf: am a08b5883: am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev
* commit '0ad986bf9d89b15334fa53bcd8bc91dfc835f460':
  Remove MediaProjection#createAudioRecord API
2014-08-18 04:06:20 +00:00
Jae Seo
e482a3f5da am 697896b0: am b6ba4f21: am d250789a: TIF: Make passthrough related method names consistent
* commit '697896b0a1af1d34b9aa10983d6c0cf11dfae914':
  TIF: Make passthrough related method names consistent
2014-08-16 05:22:12 +00:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
2014-08-16 04:52:56 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Nicolas Prévot
2e365c805a Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
6d24849387 Revert "Adding the requiredForProfile flag."
This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
2014-08-18 12:51:11 +01:00
Sailesh Nepal
7257bd8b51 Merge "Make AudioState constructors public" into lmp-dev 2014-08-16 04:01:11 +00:00
Sailesh Nepal
1d04c0f394 Make AudioState constructors public
This is needed for unit tests.

Bug: 17073934
Change-Id: I04659faa54ba03247519237450b0a26f66958e8c
2014-08-17 18:39:13 -07:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
2014-08-17 17:59:22 -07:00
Jeff Sharkey
742e790294 Progress towards staging ASECs.
Move location selection logic into shared PackageHelper location,
and share it between DCS and PackageInstaller.  Fix bugs related to
installed footprint calculation; always count unpacked native libs.

Have PMS do its own threshold checking, since it's fine to stat
devices.  PMS only ever deleted staging ASECs, so move that logic
into installer and nuke unclaimed staging ASECs.  Allocate legacy
ASEC names using PackageInstaller to make sure they don't conflict
with sessions.

Start wiring up session to allocate ASEC and pass through staged
container for installation.

Fix bug to actually delete invalid cluster-style installs.

Bug: 16514385
Change-Id: I325e0c4422fc128398c921ba45fd73ecf05fc2a9
2014-08-18 15:52:24 -07:00
Alan Viverette
634b93769c am 5ef16641: am c2e9b756: am 4779a4fa: Merge "Add spinner style for use in forms" into lmp-dev
* commit '5ef16641fb756557b1eb0193ee63ae39a73282f5':
  Add spinner style for use in forms
2014-08-16 03:33:54 +00:00
Adam Lesinski
fe2ee96947 am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
  Add FeatureGroup to PackageInfo
2014-08-16 00:44:55 +00:00
Jeff Sharkey
00eb0dc691 am 870e1f60: am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
* commit '870e1f6039b00a4878a01c59e8b407571f6361ba':
  PackageInstaller API refactoring.
2014-08-16 00:44:50 +00:00
Julia Reynolds
34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
2014-08-15 20:26:42 -04:00
Chet Haase
e4a7c1706d am d6f4feb0: am e7144508: am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev
* commit 'd6f4feb09fdfa33ace9373dd88e69ca9b7c5c05c':
  Minor doc fixes from API council recommendations.
2014-08-15 21:11:35 +00:00
Wei Wang
9960b57653 Fix API council review comments. Also hide certain APIs(1/3).
b/17006825.

Change-Id: Iee64b11920152e0ab3da54decf37fa4a83be5dc7
2014-08-15 14:07:14 -07:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set.
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
2014-08-15 16:16:38 -04:00
Alan Viverette
0a992a8288 Merge "Add spinner style for use in forms" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
91306bccf1 Merge "Add FeatureGroup to PackageInfo" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
2014-08-15 15:53:35 -07:00
Jeff Sharkey
3e3b251f46 Merge "PackageInstaller API refactoring." into lmp-dev 2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0 PackageInstaller API refactoring.
Switch to using IntentSender for results to give installers easier
lifecycle management.  Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
2014-08-15 15:57:02 -07:00
Kenny Guy
f939dbaf76 First part of renaming methods in LauncherApps.
Added new versions of the APIs that need
renaming.

Bug: 17008230
Change-Id: Ic74d21115dd250082f6dbc45d1301635cc176cfc
2014-08-15 16:35:28 +01:00