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

8892 Commits

Author SHA1 Message Date
Evan Charlton
a2a9ebf788 am 80fb21e2: am 74866adc: am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev 
* commit '80fb21e299f70a09307924b892033f201c173031':
  Remove startActivityFromInCall API
 2014-09-04 00:00:15 +00:00
RoboErik
0d0f67f5ee Update VolumeProvider apis per feedback 
Added currentVolume to constructor.
Removed onGetCurrentVolume and notifyVolume changed.
Added setCurrentVolume and getCurrentVolume.
Updated javadoc to make it clear how they're used.

bug:17258168
Change-Id: I24388aab38824b101ccc18810caa09d46aa7afe0
 2014-09-03 16:29:15 -07:00
David Smith
005038abda Merge "Add RGBA8888 to MediaCodecInfo.CodecCapabilities" 2014-09-03 23:18:14 +00:00
David Smith
5576620c13 Add RGBA8888 to MediaCodecInfo.CodecCapabilities 
Change-Id: I0604aea94702dc81c903b7f5d2715dd078c41ca6
 2014-09-03 15:06:18 -07:00
Selim Gurun
c7a8d06731 Remove unpublished optOutDataReductionProxyApi 
Bug: 17253647

Per Api council's request, remove this API.

Change-Id: I8e706cc7173b88f3f13b2ac0697f54b25f163798
 2014-09-03 14:34:24 -07:00
Nancy Chen
0c76727916 Merge "Update api for onConnectionAdded/Removed" into lmp-dev 2014-09-03 20:51:12 +00:00
Nancy Chen
b5acab4639 Update api for onConnectionAdded/Removed 
Removed methods from public API for previous change.

Bug: 17262026
Change-Id: Ic41eccf8b9c1489b6261758640a35664b39ea819
 2014-09-03 13:33:46 -07:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project). 
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
 2014-09-03 13:11:56 -07:00
Evan Charlton
4d12a03771 Merge "Remove startActivityFromInCall API" into lmp-dev 2014-09-03 20:07:47 +00:00
Tyler Gunn
9c7eb7b369 am 01907833: am c1945d0b: am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit '0190783387f53163613b489e91038d8e06858167':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 19:57:29 +00:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master 
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
 2014-09-03 19:57:35 +01:00
Tyler Gunn
65bd3eaad6 Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 2014-09-03 18:12:58 +00:00
Wally Yau
61ab997c37 am 09adc7e0: am 77f65a70: am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit '09adc7e03b3df93e3f2ae819de8f5487c46703be':
  New keycode definitions for TV remotes.
 2014-09-03 18:04:45 +00:00
Tom Taylor
8ed0015f2c am ebf58af9: am e58fbeea: am 6fd9a12c: Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
* commit 'ebf58af9c49480f5c55a8277e57e1915e55950a4':
  Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId
 2014-09-03 18:04:26 +00:00
George Mount
613a5f8805 am 3f1f97f9: am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '3f1f97f9cff3ffa28ad00bbeeada7ec70ae5c6bd':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:42:12 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Wally Yau
a25d54ffb0 Merge "New keycode definitions for TV remotes." into lmp-dev 2014-09-03 17:15:50 +00:00
Evan Charlton
23dc241d5e Remove startActivityFromInCall API 
Rip out the startActivityFromInCall API until we can replace it with
something better.

Bug: 16988478
Change-Id: Ib7b0493353262d9e795d78b78a98dd29e7a3f88e
 2014-09-03 10:07:03 -07:00
Tom Taylor
ca015d7625 Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
Bug 17371475

Change-Id: I2da8e355a3c7b037b55d38484c903f7f387aa97c
 2014-09-03 10:04:04 -07:00
Tyler Gunn
f5b29dc8cb Add supported URI scheme to PhoneAccounts. (1/4) 
Modified PhoneAccount and builder to support specifying supported
URI schemes.

Bug: 17140110
Change-Id: Ieef33bb1a6719de6f3897ed10ec38843808a7f85
 2014-09-03 09:09:12 -07:00
Sander Alewijnse
e3a406ee1e am b41ea75b: am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'b41ea75b7dff212e89682e07ee80224ea831e499':
  Add the provisioning extra admin extras bundle.
 2014-09-03 15:35:49 +00:00
Yohei Yukawa
e86e1bcd65 am 1831e14c: am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit '1831e14ce41e911d32328a87400a90b42ecd3238':
  API Review: InputConnection
 2014-09-03 15:35:43 +00:00
Vinit Deshpande
3df10a64b9 am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '217900618fedda7ddc447b2fb861d0458cf8ed0e':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 15:34:59 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Yohei Yukawa
a86977f12a am 6a1a0ada: am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '6a1a0ada78bd31cfa5e9632d955501ab8bc28a38':
  API Review: CursorAnchorInfo
 2014-09-03 13:49:05 +00:00
Esteban Talavera
808f6ef2ac Pass ComponentName to probing certificate methods 
Pass ComponentName and check whether that admin is a profile owner on DPM
get/has certificate methods (requested on the API review).

As per Change I55eec17e01489ab323f8a0e68b11592605a7b740, not keeping track of
which admins installed which certificates for now:

"Having per-admin CA certificates would be a fair bit of work. The only MDMs
we're opening this up to for now are Device and Profile Owners which 100%
manage the profile so will be the only admin.
It seems like if we keep track of "who installed which certs" it'll be a little
pointless because the answer will always be "the ProfileOwner" for every single
one."

Bug: 17005622
Change-Id: I45e9dac5236ab4ed235a341c208ac3cb6aba17da
 2014-09-03 11:50:55 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle. 
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
 2014-09-03 12:26:08 +01:00
Dianne Hackborn
07297cd527 am 2d55b767: am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '2d55b7674690fa566f927b33f7309dd68645b20a':
  Add public constant for usage stats app op.
 2014-09-03 09:13:29 +00:00
Shri Borde
421783d734 am 6b85bd4f: am be2ea906: am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev 
* commit '6b85bd4f7985061136b75c3142570afdc70e7fd4':
  Bug 17243357: Remove MessagingConfigurationManager
 2014-09-03 09:13:02 +00:00
Yohei Yukawa
d8636ea7ca API Review: InputConnection 
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
 2014-09-02 22:39:08 -07:00
Vinit Deshpande
565f847038 Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 2014-09-03 00:59:28 +00:00
Yohei Yukawa
d780ce1920 Merge "API Review: CursorAnchorInfo" into lmp-dev 2014-09-02 23:45:36 +00:00
George Mount
c03da0e7a9 Make Fragment Transitions match Acitivty Transitions API 
Bug 17188255

Change-Id: I506a097be4010d7156caf465c95295c58612c16e
 2014-09-02 15:15:12 -07:00
Dianne Hackborn
7b7b754fab Merge "Add public constant for usage stats app op." into lmp-dev 2014-09-02 21:54:56 +00:00
Yohei Yukawa
cc24e2b6a2 API Review: CursorAnchorInfo 
This CL introduces following combinable flags as a replacement
of CHARACTER_RECT_TYPE_* constants.
- CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION
- CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION

This CL also replaces #isInsertionMarkerClipped() with
flags.

Rationale:
getCharacterRectFlags() should return a set of flags, rather
than enum-like types.

getInsertionMarkerFlags() is more consistent with
getCharacterRectFlags() than isInsertionMarkerClipped().
It is also open for future extension.

BUG: 17200900
Change-Id: Ia8cbb9f6b41cd9509fc0147fd68763dfde593ffc
 2014-09-02 14:08:39 -07:00
Shri Borde
7237972bff Bug 17243357: Remove MessagingConfigurationManager 
It is replaced with SmsManager.getCarrierConfigValues

Change-Id: I560a53427b08746f2a7ed2e540ecb2c978b7ebd0
 2014-09-02 14:00:21 -07:00
ASAZU, Hideki
dbd6abaf5f New keycode definitions for TV remotes. 
Keys which are necessary for supporting world-wide broadcast
standard or used commonly for TV/STB remotes.

Change-Id: I86fa41e17fedb8133aba6cdb5aae4d560b31ae8e
 2014-09-02 13:34:44 -07:00
Michael Wright
2993c30a33 am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit 'ac0f5a4616dab78a4216d826219379a663cc1139':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:36:06 +00:00
Jean-Michel Trivi
b129930398 am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit 'dbb723022367174662a49aa4080286d454e2e0e4':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:36:01 +00:00
Dianne Hackborn
43f75b4db1 am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '347a81674350d3848e513f678cbf689074b935fd':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 18:12:20 +00:00
Dianne Hackborn
5064e7c70c Add public constant for usage stats app op. 
Change-Id: Ibc031b50e9fa4f1bd0955e0afd98e8b1bd77b905
 2014-09-02 10:57:16 -07:00
RoboErik
5652066479 am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit '5728c18ac5a248bab36f7fefbf89c12ec0284fbb':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:57:16 +00:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
Tyler Gunn
320c2af96b am 18c6fe95: am 1cfc6db2: am 1207f7a7: Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 
* commit '18c6fe953fb24414bb2b327a4d36f8e6bfebe2b4':
  Hiding videoState values in telecomm APIs. (1/3)
 2014-09-02 17:34:21 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService. 
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
 2014-09-02 10:29:28 -07:00
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +00:00