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

144071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
56e7a6a8ee am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit '4d2ee15a7dfe005461b0bdac8f518b283311fcfb':
  Add MediaProjection APIs.
 2014-07-17 22:04:05 +00:00
Jim Miller
43096b2bba Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 2014-07-17 21:58:28 +00:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint. 
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
 2014-07-18 20:48:34 +00:00
Christopher Tate
1787d9c51e Merge "Tear down agents properly at EOD in full restore" into lmp-dev 2014-07-17 21:58:28 +00:00
Christopher Tate
89101f7fe8 Tear down agents properly at EOD in full restore 
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.

Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.

Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.

Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
 2014-07-17 19:12:09 -07:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Jaewan Kim
903d6b72cd TIF: Add unblock content 
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
 2014-07-18 11:11:38 -07:00
Youngsang Cho
2b8aa9903a Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
abebf6df87 TIF: Change the parameter of TvInputInfo.loadLabel/Icon 
Labels and icons will be extracted from URI in the future.
To acheive it, we need Context rather than PackageManager.

Bug: 16166859
Change-Id: I20f0506fba5876a6cf21b70e44bb3a2265f723d7
 2014-07-17 17:49:29 -07:00
Youngsang Cho
c66ca1267c Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
e821d711db TIF: Add a notification for surface change from TvView to TvInputService 
Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
 2014-07-17 17:30:36 -07:00
Chris Craik
e755e2fdfc am 8470bb0a: (-s ours) am 152d9e61: Merge "[HWUI]: fix residual line on FrameBuffer" 
* commit '8470bb0ac9e5d8bc389b57b24363af31a0ec74d7':
  [HWUI]: fix residual line on FrameBuffer
 2014-07-17 21:47:39 +00:00
Ben Murdoch
6eef1cc804 am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '015ca0408e423d17dbf3b30ffa846ab6b6bd8a7a':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 21:41:22 +00:00
Ying Wang
ae2458d91c am 252482f4: Fix sdk build. 
* commit '252482f4258a1a3d4d9fc8a86e1b6a891dc11a4f':
  Fix sdk build.
 2014-07-17 21:36:00 +00:00
Ying Wang
4b8aa28ef2 Fix sdk build. 
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
 2014-07-17 14:30:54 -07:00
Andrew Lee
7b90dff9ba am 3441f3c5: am 9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev 
* commit '3441f3c5da64c441f1fe9c4be06e3aeac87b9f5f':
  Pass through video state when answering a call.
 2014-07-17 21:30:04 +00:00
Evan Charlton
718e174503 am 1f42afc6: am 58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev 
* commit '1f42afc6b8a4f1e0e643167f550821fd25b3fb0a':
  Plumb through StatusHints change notifications
 2014-07-17 21:29:51 +00:00
John Spurlock
95112085fc am 47631221: am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev 
* commit '47631221aeb7839b0e790423263e50076bb4266a':
  QS: Fix crash switching users.
 2014-07-17 21:29:37 +00:00
Craig Mautner
68ad9d762d am 64dc5b09: am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev 
* commit '64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
  Restore calling identity before checking permission
 2014-07-17 21:29:32 +00:00
RoboErik
86c0396b59 am 4f4d8180: am 4e8b237d: Merge "return false for media keys if no controller" into lmp-dev 
* commit '4f4d81805635072186c4eb63d395f995d9f8db2d':
  return false for media keys if no controller
 2014-07-17 21:29:28 +00:00
Sandeep Siddhartha
d167224510 Merge "Test hotword flow" into lmp-dev 2014-07-17 21:15:46 +00:00
Sandeep Siddhartha
7444c906fa Test hotword flow 
- Also fix a few StrictMode violations in DatabaseHelper

Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
 2014-07-17 18:44:12 -07:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs. 
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
 2014-07-17 14:30:19 -07:00
Wonsik Kim
61635036ac Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev 2014-07-17 21:11:29 +00:00
Wonsik Kim
187423c0bc TIF: one-to-many relationship for TvInputService to TvInputInfo 
The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.

Bug: 16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
 2014-07-18 09:38:59 +09:00
Amith Yamasani
6bce0f739b Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 2014-07-17 21:09:48 +00:00
Amith Yamasani
570002ffd4 Add a hidden API to expose cross profile caller id check 
To be used by telephony/contacts.

Change-Id: If8e06c20a708ce5e8f7d717d8758c19a78efa46d
 2014-07-18 22:51:04 +00:00
Sailesh Nepal
e7127ff031 Merge "Add Connection.startActivityFromInCall" into lmp-dev 2014-07-17 21:09:48 +00:00
Sailesh Nepal
2ab88cc313 Add Connection.startActivityFromInCall 
This CL adds a new public API to allow Connections
to start an activity on top of the in-call UI.

The Connection passes a PendingIntent to Telecomm which
then forwards it on to InCallUI. The Connection can cancel
the operation by calling PendingIntent.cancel().

This allows services like SIP and Hangouts to show dialogs
to the user when making a call.

Change-Id: I65119a89c925a93467d1b27304ffec9b088b172f
 2014-07-18 14:59:30 -07:00
Sailesh Nepal
480315939d Use main thread for RemoteConnection callbacks 
Currently call backs from RemoteConnection can happen
on non-main threads. This CL updates the code to always
use the main thread.

Change-Id: I134c0fbdba1f916f49676c0c6696ac63bcb7c513
 2014-07-18 14:21:23 -07:00
Ye Wen
24164efda3 Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 2014-07-17 21:09:48 +00:00
Ye Wen
2ab56b0d1f Unhide MMS APIs for MSIM (1/2) 
b/14095333

Change-Id: I26a7fa657ba44799d2fb3a75f49c600f4a02746a
 2014-07-18 14:16:59 -07:00
Ihab Awad
f93769c4ce Merge "Wire up multi-SIM experience (1/4)" into lmp-dev 2014-07-17 21:09:48 +00:00
Ihab Awad
94cf4bff13 Wire up multi-SIM experience (1/4) 
Change-Id: Ib63843267f06b329a675e7ea86167b2cbb554f1b
 2014-07-18 10:02:25 -07:00
Jean-Michel Trivi
010150a136 Merge "Unhide audio virtualizer capability query methods" into lmp-dev 2014-07-17 21:09:48 +00:00
Jean-Michel Trivi
2e7dd4bfc2 Unhide audio virtualizer capability query methods 
Unhide the new method to query the Virtualizer effect implementation
 about its capabilities in terms of input, device support, and
 virtual speaker angles.

Change-Id: I4478f7837efe8c9d52978244a3402c7f8590e585
 2014-07-18 08:01:07 -07:00
Zhijun He
d1d2d43fc0 Merge "Camera2: partialResultCount should be optional" into lmp-dev 2014-07-17 21:09:48 +00:00
Zhijun He
1420de4162 Camera2: partialResultCount should be optional 
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
 2014-07-17 17:45:54 -07:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature 
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
 2014-07-18 12:00:20 +09:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
destradaa
841566e295 am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit '607d3271089e4874028aca9cfbede38c557961bb':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 21:04:28 +00:00
Sailesh Nepal
4bf2736ad4 Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 2014-07-17 21:04:20 +00:00
Eino-Ville Talvala
aff282506f am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 20:59:30 +00:00
Winson Chung
2eaf60c15e am 2a2b956e: am 3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 
* commit '2a2b956e3f405b91fb2fdcaabc663a799dec69b2':
  Fixing optimization in Task loading. (Bug 16372369)
 2014-07-17 20:59:26 +00:00
Chris Craik
35dd4b0fca am 13171876: am 8ca30207: Merge "Minor cleanups around color usage" into lmp-dev 
* commit '1317187663ee869b9c6655abce1211cd1520ee11':
  Minor cleanups around color usage
 2014-07-17 20:59:23 +00:00
Chris Craik
e7edf9587e am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5 am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
  Add nested pre-fling for nested scrolling
 2014-07-17 20:58:56 +00:00