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

8577 Commits

Author SHA1 Message Date
Yorke Lee
d7b4182e32 am e63ea6a4: am fa0efcd1: am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit 'e63ea6a4009e6db4c3cfb4b354f527910b30b8d8':
  Make AudioState modes static constants
 2014-08-21 04:09:00 +00:00
Sailesh Nepal
cb9eac4788 am b7b8b579: am 2c4ffbf9: am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 
* commit 'b7b8b579c15c2d0cd77b0a93a122014890edd201':
  Clean up and fix bugs in ConnectionService.createConnection
 2014-08-21 04:08:14 +00:00
Jeff Sharkey
40aff029fe am 44884372: am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '448843725d388c409a0ac20602fbc5611e7b2134':
  More progress towards split APKs in ASECs.
 2014-08-21 03:33:20 +00:00
RoboErik
6b171b36f8 am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev 
* commit '666360cbe70a3c482b16a0fd438a3f10d0fcf643':
  Api updates to MediaSession components
 2014-08-21 00:57:08 +00:00
Sailesh Nepal
163a80538e Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 2014-08-20 21:39:11 +00:00
Chris Craik
aa0b5f1031 am d2affeca: am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev 
* commit 'd2affecab253cd4e96a7b4c67fa2e38bc89df122':
  Add outlineProvider attribute
 2014-08-20 18:08:20 +00:00
Sailesh Nepal
cf7020b7e8 Clean up and fix bugs in ConnectionService.createConnection 
This CL fixes serveral issues with the createConnection code:
  - it uses failureCode/failureMessage which were never set.
    Renamed to disconnectCode and disconnectMessage and set
    those fields in Connection.setDisconnected
  - Connection.CANCELED_CONNECTION was static and it caused
    lots of log spew which was confusing. Changed to create
    a new connection every time, same as failure
  - moved sNullConnection from Connection to ConnectionService
  - made FailureSignalingConnection private and removed type
    checks for it. Using disconnect code is better, this is
    already what ConnectionServiceWrapper does

Note, the current code still expects connections to be cancelled
or failed in synchronously. This bug is being tracked separately.

Bug: 17156304
Change-Id: I0b13a78b738c4bf37a69de9fd5dcd17be0c45c14
 2014-08-20 10:45:08 -07:00
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
Chris Craik
e2527bc206 Merge "Add outlineProvider attribute" into lmp-dev 2014-08-19 22:53:25 +00:00
Chris Craik
f56885d413 Add outlineProvider attribute 
bug:16871683
Change-Id: Iae9326c41872ac03d40ebeec6257522a34cbe1ff
 2014-08-19 18:04:14 -07: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
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