Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,307 Commits 3 Branches 0 Tags
20952fac85efaf97c04da8141992cd0197fc65fe
Commit Graph

143307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
20952fac85 am b1bcf059: am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev 
* commit 'b1bcf0591321914011ea0feed8e8496bbc945e05':
  Shade: Hide status icons, take 2.
 2014-07-18 02:50:57 +00:00
Christopher Tate
e743b69faa am 85f64ae6: am 912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
* commit '85f64ae60cfe6bafd8ea2d60c45b18a531436344':
  Properly end full restore attempt if getNextFullRestoreDataChunk() fails
 2014-07-18 02:50:51 +00:00
Chris Craik
90ed6a24d6 am 19581d6b: am a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev 
* commit '19581d6b307ef3e62d83bb890d6308a341799af4':
  [HWUI]: fix residual line on FrameBuffer
 2014-07-18 02:50:44 +00:00
Michael Wright
e4da19a9f1 am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
  Add MediaProjection APIs.
 2014-07-18 00:32:13 +00:00
Ben Murdoch
3aa88cd61a am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:48:26 +00:00
Ying Wang
be96f2c49f am 2c8f81e7: am 252482f4: Fix sdk build. 
* commit '2c8f81e792dfe40f503587979a82e6761c7d5f0a':
  Fix sdk build.
 2014-07-17 23:48:21 +00:00
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:48:08 +00:00
Craig Stout
1d83a41fa7 am 04e9457b: am 68e9eb34: Fix legacyMode for leanback timepicker 
* commit '04e9457bdd95a4e8c93538697c791f60b27cfc1c':
  Fix legacyMode for leanback timepicker
 2014-07-17 23:47:57 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:47:52 +00:00
Zhijun He
3ddb88ecd3 am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '3bce07590a097d2e904daa549e3083415e3c4051':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:47:45 +00:00
John Spurlock
92e2fa75be am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev 
* commit 'd92f55cb1169c51858152b9787ba5d3e685ae86b':
  Shade: Hide status icons, take 2.
 2014-07-17 23:15:32 +00:00
Christopher Tate
b658954467 am 912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
* commit '912793dc95c09d384587195c667958723cac646a':
  Properly end full restore attempt if getNextFullRestoreDataChunk() fails
 2014-07-17 23:04:24 +00:00
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
 2014-07-17 23:01:04 +00:00
Chris Craik
ae9d625126 am a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev 
* commit 'a987914f5c43a1651846121e5009a84bb05f87b0':
  [HWUI]: fix residual line on FrameBuffer
 2014-07-17 22:42:29 +00:00
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
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
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
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
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
Joe Fernandez
b69065f30d am c12515e3: am aafe9d65: am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'c12515e3f1119e265e5807f360a96d9daf1c6055':
  docs: Update ADT-1 page with supported apps
 2014-07-17 20:58:46 +00:00
John Reck
5b9d47ebdc am 042db5e1: am bce422bd: Merge "Fix logging" into lmp-dev 
* commit '042db5e1283ec33a2c0045bf2ce6be2f3f1dc7c9':
  Fix logging
 2014-07-17 20:58:42 +00:00
Ruben Brunk
e5d53bd1ba am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
  camera2: Fix swapped Face detection commands.
 2014-07-17 20:58:38 +00:00
Jeff Sharkey
33e5a6be31 am 37f7e245: am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev 
* commit '37f7e24584b0a85adc6d699818e3e863c261e4ed':
  Support cluster-style installs for bundled apps.
 2014-07-17 20:58:31 +00:00
Sandeep Siddhartha
03bf0ff120 am 15cafc26: am 4b360037: Support model deletion 
* commit '15cafc26085a0de7767db4d9000f588b1a4409f6':
  Support model deletion
 2014-07-17 20:58:22 +00:00
Craig Mautner
25dd00a519 am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 
* commit '73c69b2727b311d12f1ca8ad197db7cbe83d162c':
  Additional cleanup after stack deletion.
 2014-07-17 20:58:17 +00:00
Adrian Roos
ce441452a5 am 627e93b0: am 26f08cdc: Merge "QS Guest fixes" into lmp-dev 
* commit '627e93b0ad11ec90309ca9f5fd69b426696b3069':
  QS Guest fixes
 2014-07-17 20:58:13 +00:00
Christopher Tate
be786a1f69 am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 20:58:09 +00:00
ztenghui
6db9d5f675 am f93ffd99: am e1bc5ddb: Add the RTL support to VectorDrawable. 
* commit 'f93ffd9941c5a4e5c7b256cab6da027f2457063c':
  Add the RTL support to VectorDrawable.
 2014-07-17 20:58:05 +00:00
John Reck
0c95c14487 am ff70ea07: am 47751fe1: Revert "Separate Canvas JNI code from the implementation." 
* commit 'ff70ea07c2e167a0b66624f7b69068c826c74008':
  Revert "Separate Canvas JNI code from the implementation."
 2014-07-17 20:58:01 +00:00
Winson Chung
7924ba40f5 am 1a1fa42b: am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020) 
* commit '1a1fa42b9502dc3c95e0103505b276083a2a5692':
  Fixing regression in flinging not updating the stack. (Bug 16371020)
 2014-07-17 20:57:58 +00:00
Adam Connors
f8904a2b43 am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
  Create DPM APIs for cross profile callerId
 2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570 am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 20:57:50 +00:00
Nancy Chen
7697c60075 am 74e775a5: am 4a9b99f5: API changes to enable account selection for a call 
* commit '74e775a56ce0af604f0b8bd493d270c4f15bacc9':
  API changes to enable account selection for a call
 2014-07-17 20:57:46 +00:00
Craig Mautner
1e4603547a am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 
* commit '96de06e63e63fa66c4c5b419164c74b512d00ae8':
  Wait for all windows to draw before turning screen on
 2014-07-17 20:57:42 +00:00
Martin Kosiba
0db75fe2b0 am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager. 
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
  Allow for appending of resources to an AssetManager.
 2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 20:57:31 +00:00