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

9642 Commits

Author SHA1 Message Date
Justin Koh
2d42f48449 am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:33:36 +00:00
Sailesh Nepal
3fdf2a84c0 Make APIs to get system phone accounts public 
This is used by Wi-Fi calling to handoff and incoming
call to a cellular call.

For example, when doing an handoff we can look through
the outgoing phone accounts and find the one that the user
has verified with their google account. We can then
handoff to that phone account.

Bug: 17686424
Change-Id: I06d42aa8f4a36d11e5293ed6f7c62b796226f5c1
 2014-11-06 12:20:56 -08:00
Jeremy Joslin
46e3ac8bbc Implemented requestNetwork with a PendingIntent. 
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
 2014-11-06 11:43:27 -08:00
Sailesh Nepal
55c3de783b am a4b3d3d3: am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'a4b3d3d32f924bf29ba081aae8528cf617742667':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:26:32 +00:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause 
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
 2014-11-05 21:02:37 -08:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
mike dooley
3f60f6c084 am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '9beb54db9ef78c23dd06822a6e3426d6374b26c2':
  Adding method to get disconnect cause from conference
 2014-11-06 03:01:54 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
RoboErik
305563bd63 am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 19:01:40 +00:00
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:26:00 +00:00
RoboErik
131e63adaa Add extras to the PlaybackState 
This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
 2014-11-04 13:47:45 -08:00
RoboErik
566c1ed18f Add setRatingType to MediaSession 
This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
 2014-11-04 13:14:19 -08:00
Justin Koh
7c1ad0cac6 Hide Surface#lockHardwareCanvas DO NOT MERGE 
Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
 2014-11-04 11:26:14 -08:00
mike dooley
1cf14ac5dc Adding method to get disconnect cause from conference 
Bug: 17842499
Change-Id: Ifb6e61d50d66aa8e8299e7024b2ab6d1d0f9d878
 2014-11-04 11:21:21 -08:00
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Narayan Kamath
f47a6db44b am f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit 'f2196a6ed5988f87d0e04cc30f0f82f7ea431095':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:16:22 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Stuart Scott
f5845fb756 am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit 'a93dee63de4ce37343577e171571ac9e1d6effa0':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:28:04 +00:00
Nancy Chen
4741ceefc2 am 4f03fa90: am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit '4f03fa903b6ce4ece24b113e0a9440746445a378':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 02:28:24 +00:00
Stuart Scott
b600d890a6 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 2014-11-04 01:29:00 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Stuart Scott
95fc99b334 Clean up public API of SubInfoRecord. 
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
 2014-11-03 11:11:56 -08:00
Nancy Chen
b2299c1303 Adn queries for multi-SIM. (2/3) 
Define a method in Telecom to take in a subscription account and return
the URI for an ADN query for that account.

Bug: 17917937
Change-Id: Ic50a4add7fe44a5164271dc9c9e5a58e45e72336
 2014-11-03 11:11:56 -08:00
Griff Hazen
5f2edfc12c Improve support for the barcode-on-screen use case for wearables. 
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.

Bug: 16299175
Bug: 17005635

Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
 2014-11-03 09:53:54 -08:00
Narayan Kamath
9d68b3c839 Remove deprecated DateFormat APIs. 
bug: 18074066
Change-Id: I99cef45105c9f25075c596cf4f52ec5573565596
 2014-11-03 16:01:32 +00:00
Santos Cordon
71a4f2129f am 082f4978: am 04f3eebe: am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '082f49786ec25b254992781a5ad3c67e75ceb8ee':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 08:09:40 +00:00
Santos Cordon
27be7b3586 Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 2014-11-03 07:54:05 +00:00
Nick Kralevich
021e5db2b6 fix build 
Change-Id: I57f96d3341485a906049c90808fb321a0111e880
 2014-11-01 22:26:45 -07:00
Nancy Chen
34378f3c5d am 6a44c194: am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev automerge: 346f907 
* commit '6a44c194e7a40af82918cf31d44c00d30e92fa24':
  Handle MMI for multi-SIM (1/3)
 2014-10-31 22:17:54 +00:00
Christopher Lane
1bb81dd46e am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9 
* commit 'c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96':
  Add convenience method for getting the complex unit type
 2014-10-31 22:13:29 +00:00
Nancy Chen
e1678ddf7a Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev 2014-10-31 22:06:28 +00:00
Christopher Lane
be36ebc28d Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 2014-10-31 22:01:35 +00:00
Christopher Lane
9f357ae9f0 Add convenience method for getting the complex unit type 
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
 2014-10-31 14:52:06 -07:00
Santos Cordon
2ef87ee728 Split Telecom PhoneAccount registration permissions. 
Bug: 18106506
Change-Id: Ic825b44c2dc42709073a3990f6a7ca8e372025e9
 2014-10-31 14:44:30 -07:00
Svetoslav
e7d267e3d8 am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b 
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 20:04:14 +00:00
Svetoslav
b1ecf0d776 Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 2014-10-31 19:53:32 +00:00
Nancy Chen
95e8a67933 Handle MMI for multi-SIM (1/3) 
+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber
+ Add Select Account dialog in Dialer for MMI

Bug: 17917937

Change-Id: I26fdc68a07ca0483bf7a052598fe31b1461fd486
 2014-10-31 11:26:38 -07:00
Tyler Gunn
5754ea5a13 am 23c7b8f1: Merge "Creating connections for conference event package participants." into lmp-mr1-dev automerge: 450f904 automerge: 2257fe8 
* commit '23c7b8f16f8056edfd6328a539b265c90b1f1853':
  Creating connections for conference event package participants.
 2014-10-31 03:49:20 +00:00
Tyler Gunn
450f9047ce Merge "Creating connections for conference event package participants." into lmp-mr1-dev 2014-10-31 03:16:09 +00:00
John Spurlock
57177c75ea am 68fdbd01: am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit '68fdbd01798dad380581d02c5b9d229aecb10ef0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:36:32 +00:00
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:25:37 +00:00
Alan Viverette
9b0ac44b41 am b50a6f39: am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'b50a6f39ca8bafee342852de50029077be47334f':
  Add setters for window elevation and clipToOutline properties
 2014-10-31 00:01:21 +00:00
Tom Taylor
fe388319ab am d034f1a3: am b281c068: am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 
* commit 'd034f1a3d4add05970f7801abb4645d9f84abc16':
  Add a missing mms_config constant to SmsManager
 2014-10-31 00:01:02 +00:00
Alan Viverette
571355d9f5 am 7d965566: am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '7d96556604046bb0c0f4e4c6e5ac4ca487cdbb06':
  Add content description to Toolbar collapse button
 2014-10-30 23:59:43 +00:00
Svetoslav
6c70290ff0 Adding APIs to enable apps to influence accessibility traversal. 
Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.

Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.

This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.

This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.

bug:17319923

Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
 2014-10-30 16:55:53 -07:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants. 
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.

Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
 2014-10-30 14:27:48 -07:00