drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,906 Commits 1 Branch 0 Tags
Commit Graph

5776 Commits

Author SHA1 Message Date
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Zhijun He
cac49eb610 am acb8f467: am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'acb8f467c86452b849dc6410db27668525baa075':
  Camera2: update aberration correction related tag name
 2014-08-21 16:48:02 +00:00
Esteban Talavera
8a4f5c7b0e am 065746f2: am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '065746f261d1d650d0ac492ad39abdf982a170ed':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:47:22 +00:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Esteban Talavera
fc3487fe49 am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:31:58 +00:00
Esteban Talavera
4d3fc0b828 am 3c736f5a: am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '3c736f5a538c44e6a438157a18378abad036c75b':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:21:58 +00:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
6f52c702fb am fd496a2c: am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit 'fd496a2c66d6f45e0cb009e8a52360b3560cdcc4':
  Remove setApplicationsHidden
 2014-08-21 14:43:53 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Niels Egberts
a1fc998924 am 190d2222: am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '190d22224884cad530b2f8a1a671e91fd3f80244':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 13:39:34 +00:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master 
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
 2014-08-21 14:34:37 +01:00
Niels Egberts
5e5ee9945b Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 2014-08-21 11:33:01 +00:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00
Niels Egberts
b9f7692ce6 Fixed spelling of android.nominative and updated some comments. 
Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
 2014-08-21 11:28:29 +01:00
Esteban Talavera
115cd65d2a Remove setApplicationsHidden 
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
 2014-08-21 10:29:38 +01:00
Jae Seo
f06b40e8b5 am 128b1a8d: am 797eeba5: am 9c179483: API Review: android.media.tv 
* commit '128b1a8df3621158eac0737baadc6fe388b98a23':
  API Review: android.media.tv
 2014-08-21 05:16:12 +00:00
Zhijun He
9e4e439a68 Camera2: update aberration correction related tag name 
This is for API review update.

Bug: 17008587
Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0
 2014-08-20 22:08:52 -07:00
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
Jae Seo
14355950d5 API Review: android.media.tv 
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
 2014-08-20 20:59:51 -07: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
Dianne Hackborn
aec68bb89f Fix issue #17038762: Add API to add entries to the recents list 
New API Added to ActivityManager for adding an entry.  See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
  to modify it, but thumbnails are loading immutable so crashes.  Fixed
  this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
  Also split the recents dump output from the rest of the activity
  output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
 2014-08-20 18:03:43 -07: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
Kenny Guy
fa80a4faa3 Add apis for whitelisting IMEs and accessibility services. 
Adds apis for device / profile owners to white list
the accessibility and input methods a user can enable.

Bug: 14469005
Change-Id: I921888660d29a5370395db87adf75d4d106660c9
 2014-08-20 22:30:05 +01: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
Esteban Talavera
f057f06631 Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC 
As requested in the API review. References to that field fixed on changes I123a5193d03b313160f934644b02be62b8394649 and Ibf1bb38f481e9e0dd898d662b18a1c54f201f830

Bug: 17005622
Change-Id: I08c53465d98678c06f65eeed5e7e9dcdce7bbcf0
 2014-08-20 13:36:05 +00:00
Andre Eisenbach
4072da041d LE: Rename new MTU and connection paramter update APIs 
bug 17005342

Change-Id: I23151e1e92fe86896fc2883f81aef82084bb4215
 2014-08-20 02:03:57 +00: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
Andres Morales
b59d35c16d Remove old NFC unlock api 
Bug: 16401635
Change-Id: I667d91c2346355ed0a2115644e6192f5f208e288
 2014-08-19 13:13:10 -07: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