Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,607 Commits 3 Branches 0 Tags
7511526792da456bcab63dde5dfd3e7bbc6ffbe6
Commit Graph

8560 Commits

Author SHA1 Message Date
Amith Yamasani
7511526792 resolved conflicts for merge of 83726dfc to master 
Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98
 2014-08-20 08:41:02 -07:00
Jae Seo
2516fb5d14 am 8a98d4b5: am 2377dbed: am d2366e55: Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 
* commit '8a98d4b5aac0eda2c3728b8f1eb6a02d4ba0b202':
  TIF: Add the video frame rate information to TvTrackInfo
 2014-08-20 01:22:53 +00:00
Amith Yamasani
609aaca4d8 Merge "Rename restrictions API class and method" into lmp-dev 2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6 Rename restrictions API class and method 
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission

Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
 2014-08-19 17:03:41 -07:00
Jae Seo
2ad2624339 am 3261e435: am 785c8732: am 03d07be7: API Review: android.media.tv 
* commit '3261e43519caeaf94bbab959f381013854c127c4':
  API Review: android.media.tv
 2014-08-19 22:45:54 +00:00
Adam Powell
1c0ae91122 am 0a4cfd8a: am 38ec99a8: am 09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev 
* commit '0a4cfd8ab99f6f887d15a6747835d1a5c5525b38':
  Make Toolbars (and Toolbar-based ActionBars) have constant text size
 2014-08-19 22:36:33 +00:00
Jae Seo
1553a528a5 API Review: android.media.tv 
TvView:
- Instead of ERROR_INPUT_DISCONNECTED, a separate callback
  onDisconnected; change onError to onConnectionFailed.

Bug: 17114406
Change-Id: I9457ac81c883610f96954494bf75a4e78e53383f
 2014-08-19 22:20:22 +00:00
Ihab Awad
de145d3ad5 am c2f59afc: am b5d4eaae: am 940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev 
* commit 'c2f59afc85878a82e89f1a42dafe3d1f9612cd0a':
  ConnectionService API has only one completed callback (1/3)
 2014-08-19 21:45:29 +00:00
Jae Seo
3acf66f558 Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 2014-08-19 21:23:09 +00:00
Shishir Agrawal
a76edf7028 am e8b22f7e: am 8fa2b622: am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 
* commit 'e8b22f7e0f1c1817c8902dff940a63b9750b8726':
  Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
 2014-08-19 19:32:50 +00:00
Jae Seo
47b9e4afc9 TIF: Add the video frame rate information to TvTrackInfo 
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
 2014-08-19 12:02:16 -07:00
RoboErik
a1f64b6eb5 am c6c011af: am eb81b54a: am 368325e4: Update MediaSession APIs for council feedback 
* commit 'c6c011afb4867fadbc1f556c73e4bdfcf6929c4c':
  Update MediaSession APIs for council feedback
 2014-08-19 17:43:25 +00:00
George Mount
7f8dff7ebe am c2be2d14: am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet. 
* commit 'c2be2d1432b540f64b3d735bb790708a2a64800d':
  Add a way to get Transitions from a TransitionSet.
 2014-08-19 17:30:24 +00:00
RoboErik
a66c40bf6e Update MediaSession APIs for council feedback 
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
 2014-08-19 17:12:42 +00:00
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
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
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 531270a4a1.

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
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