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

160099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
b561ccedd8 audio: allow audio port cache update even when audio patches contain invalidated sources/sinks 
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.

Bug: 18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
 2015-01-31 01:51:28 +00:00
Joe Fernandez
1a9bf5c100 Merge "docs: training intent doc error update" into lmp-docs 2015-01-31 01:00:16 +00:00
Rich Slogar
367bfb3b50 docs: training intent doc error update 
b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
 2015-01-30 16:55:55 -08:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00
Deepanshu Gupta
1d59871e4e Merge "Resource resolution fixes." into lmp-dev 2015-01-31 00:48:57 +00:00
Joe Fernandez
3548de6073 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
  docs: studio emulator platform update
 2015-01-31 00:14:39 +00:00
Jon Larimer
9e7e8afbb9 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-31 00:05:54 +00:00
Joe Fernandez
5c37c8e662 am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update
 2015-01-30 23:41:10 +00:00
Joe Fernandez
d801a12383 am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update
 2015-01-30 23:34:44 +00:00
Joe Fernandez
2b68ab3add Merge "docs: studio emulator platform update" into lmp-docs 2015-01-30 23:25:51 +00:00
Jon Larimer
90d5bd8daa am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:24:43 +00:00
Jon Larimer
feb362a5d1 am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:18:34 +00:00
Jon Larimer
a0d3bfbe87 am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:11:56 +00:00
Stuart Scott
147b6a3522 Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 2015-01-30 22:09:38 +00:00
Jon Larimer
5c9d0de174 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:01:50 +00:00
Jinsuk Kim
3457ae4709 Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 2015-01-30 22:00:40 +00:00
Jinsuk Kim
4361549891 Revert "CEC: Let playback device switch TV input after bootup" 
This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b.

Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
 2015-01-30 21:58:18 +00:00
Jon Larimer
545dd853bf am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:54:31 +00:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:28:59 +00:00
Jon Larimer
d403180997 am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 19:30:57 +00:00
Jason Monk
b2dd5cb900 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 2015-01-30 18:27:53 +00:00
Jason Monk
8ba572a327 Fix QS bluetooth tile accessibility issue 
Bluetooth tile was not announcing its state when the top half was
clicked.  This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information.  So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.

Bug: 19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
 2015-01-30 13:02:27 -05:00
Jason Monk
3c68ca2fea Fix expandSettingsPanel status bar call 
Use the same mechanism as the two finger gesture to get it to open
correctly.

Bug: 19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
 2015-01-30 12:10:15 -05:00
Alan Viverette
d38cc74921 Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 2015-01-30 03:15:07 +00:00
Legler Wu
85973dcf8c [DS] Correct the access method for telephony system property 
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
 2015-01-29 19:02:55 -08:00
Christopher Ferris
fd41feee6b Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 2015-01-30 02:29:27 +00:00
Rich Slogar
e9e2707fef am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
  docs: linux requirements update
 2015-01-30 01:58:22 +00:00
Scott Rowe
1b5a0fb681 am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
  docs: Card View for Android TV training
 2015-01-30 01:53:53 +00:00
Scott Rowe
9ad282fd73 am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:53:48 +00:00
Rich Slogar
f4fa2acb22 am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit '6ccb72e685da6769d43545c21182ca44e039da3e':
  docs: linux requirements update
 2015-01-30 01:49:12 +00:00
Scott Rowe
8f5714d3e1 am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'a303121168f1e3cfe62f6836a38ba1a33f3e336d':
  docs: Card View for Android TV training
 2015-01-30 01:44:43 +00:00
Scott Rowe
2d1c5dc8ef am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit 'e4249f29ea56f35aab1337323a0e55992ee9247f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:44:39 +00:00
Rich Slogar
6ccb72e685 am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update
 2015-01-30 01:41:58 +00:00
Scott Rowe
a303121168 am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'b86c3b80db09da85b50c1809520bbf893cb83d93':
  docs: Card View for Android TV training
 2015-01-30 01:37:23 +00:00
Scott Rowe
e4249f29ea am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:37:21 +00:00
Rich Slogar
e0063faa87 Merge "docs: linux requirements update" into lmp-docs 2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db Merge "docs: Card View for Android TV training" into lmp-docs 2015-01-30 01:30:44 +00:00
Alan Viverette
3e2ec1cc9c Avoid bug in LinearLayout measurement 
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.

Bug: 19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
 2015-01-30 01:30:23 +00:00
Amit Mahajan
45446c6321 Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 2015-01-30 00:52:50 +00:00
Sailesh Nepal
38710f03c9 Merge "Fix crash when making emergency calls" into lmp-mr1-dev 2015-01-30 00:31:12 +00:00
Christopher Tate
b71ac19308 Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev 2015-01-30 00:06:18 +00:00
Christopher Ferris
95b1048d39 Fix wrap property creation when truncating. 
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947

(cherry picked from commit e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
 2015-01-29 15:54:40 -08:00
Christopher Tate
e77c12ba37 Don't run full-data backups when backup is disabled 
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations.  Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.

(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)

Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.

Bug 19197062

Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
 2015-01-29 15:47:43 -08:00
Raph Levien
d24047dcfe Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 2015-01-29 23:04:15 +00:00
Igor Viarheichyk
6f9f1d4b3b Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)

Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2015-01-29 15:00:13 -08:00
Jinsuk Kim
9c5ccc3684 Merge "CEC: Discard key event to itself" into lmp-mr1-dev 2015-01-29 22:33:43 +00:00
Jinsuk Kim
454fab5219 CEC: Discard key event to itself 
Should discard keyevents if the target address is the device itself.

Bug: 19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
 2015-01-30 07:28:10 +09:00