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

163172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
0d30c930c3 am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev 
* commit '38710f03c92a57ec00830e146a0714254c635405':
  Fix crash when making emergency calls
 2015-01-30 00:36:07 +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
9b36d1117a am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit 'b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:11:59 +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
61ff4d1deb am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit 'd24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:17:01 +00: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
7bf039b67c am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
  CEC: Discard key event to itself
 2015-01-29 22:39:57 +00: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
Jinsuk Kim
eb2c4a07a1 am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
* commit 'dbdaea0c6d44ead142f42ac060af2f5cd7f942ac':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:26:01 +00:00
Jinsuk Kim
1ebbe91658 am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '3f923474248e24706e7977a7512b0a35cff835a7':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:25:57 +00:00
Raph Levien
2ed9a7e5ac am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit 'af461e12a12dba8fc544fa373831368ba2c18096':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:25:51 +00:00
Jinsuk Kim
dbdaea0c6d Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 2015-01-29 22:22:31 +00:00
Jinsuk Kim
3f92347424 Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 2015-01-29 22:21:54 +00:00
Raph Levien
af461e12a1 Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 2015-01-29 22:11:00 +00:00
Sanket Padawe
60e4edfb94 am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
* commit '5df10e1842606f9a9a829a4779bf8f610b2d7bd9':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:47:42 +00:00
Sanket Padawe
5df10e1842 Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 2015-01-29 21:44:05 +00:00
Jon Larimer
48c95c4370 Fix build breakage in older branches by avoiding <> notation 
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
 2015-01-29 15:54:43 -05:00
Raph Levien
42b3024efd Refine resolution order for typeface and fontFamily 
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.

Bug: 16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
 2015-01-29 12:49:19 -08:00
John Reck
5f3e21cebe am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 
* commit '6efc3ac6d2094c72b6a2e288101a5349b017274d':
  Allow ~Layer() to happen after onGLContextDestroyed
 2015-01-29 20:18:58 +00:00
John Reck
6efc3ac6d2 Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 2015-01-29 20:13:05 +00:00
Jon Larimer
49127bddaf am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '0312d2ff45d895260f0995fc784bea706bd4f13d':
 2015-01-29 19:51:08 +00:00
Jon Larimer
eb56f7a5dc am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':
 2015-01-29 19:51:05 +00:00
Tyler Gunn
8a2b1199a6 Fixing conference merge where only one party is added to conference. 
- Adding "onConferenceStarted" listener for Connections.
- This is necessary so that an ImsCall can report the fact that it has
went from being a single party call to a multiparty call.  This was not
previously necessary since the multiparty bit change would be detected
when one of the connections being merged changed state.  Since we now must
defer the establishment of the conference until all connections have been
merged, we need a means of detecting when the call becomes multiparty.

Bug: 18960042
Change-Id: I3ba138cb546e3efdf89b29d6676d00257a5e00cd
 2015-01-29 11:47:24 -08:00
Jon Larimer
0312d2ff45 am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '320f505ed52f8970b08eb93766af831de0332415':
 2015-01-29 19:46:00 +00:00
Jon Larimer
4c2a6fddb1 am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '64bdf77d9515f587f31998b614e524c26b2415a4':
 2015-01-29 19:45:56 +00:00
Jon Larimer
320f505ed5 am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '52fba8d13428665fde405ef91857c00f0d399610':
 2015-01-29 19:38:51 +00:00
Jon Larimer
64bdf77d95 am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '8bb65246f2655fae8d807db973c5eaeff78733cc':
 2015-01-29 19:38:48 +00:00
Jon Larimer
52fba8d134 am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 
automerge: bebfd58

* commit 'bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
 2015-01-29 19:30:57 +00:00
Jon Larimer
8bb65246f2 am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours 
automerge: 6fe42f0  -s ours

* commit '6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
 2015-01-29 19:29:31 +00:00
Sanket Padawe
14d21344d2 Suppress logging to avoid showing phone no. 
Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
 2015-01-29 11:21:34 -08:00
Scott Rowe
87a1bf0970 docs: b/19193358 Android TV overscan instructions: settings reversed in text 
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
 2015-01-29 11:05:13 -08:00
Jon Larimer
ac436d55fc am feabeb62: am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'feabeb624361c234279a03c6dcdb6a53ee48eddc':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 19:04:40 +00:00
Jon Larimer
ee7e1479f5 am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '51ea897fca66c4042563a89f4593b9fd41f01b9d':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 19:04:37 +00:00
Jon Larimer
feabeb6243 am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '8b8d61952a4599439f3308a5f73bb0a2a0610563':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:57:20 +00:00
Jon Larimer
51ea897fca am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '470f3a98be8ecff3beca275c20b085da928e8943':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:57:17 +00:00
Jon Larimer
bebfd58604 am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
automerge: ea63fd7

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:55:25 +00:00
Jon Larimer
6fe42f0870 am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
automerge: 48dad94  -s ours

* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:54:16 +00:00
Scott Rowe
da0c5de5fa docs: Card View for Android TV training 
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
 2015-01-29 10:50:25 -08:00
Jon Larimer
8b8d61952a am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '9570e144fe38a53c507838cc5234225c7a0da315':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:50:24 +00:00
Jon Larimer
470f3a98be am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '0a63d8176d8c3099c2e40bdbb00220f5aeeff69e':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:50:21 +00:00
Jon Larimer
3308ad42fa am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours 
* commit '95b85c1539c1569371ba0576da635e3e2557a433':
 2015-01-29 18:47:54 +00:00
Jon Larimer
9570e144fe am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:43:47 +00:00
Jon Larimer
0a63d8176d am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:43:43 +00:00
Jon Larimer
95b85c1539 am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours 
* commit '9a2793e0ba11336b57457cde0d6dbc3628e853ed':
 2015-01-29 18:40:14 +00:00
Jon Larimer
ea63fd7f9b am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:36:59 +00:00
Jon Larimer
48dad94919 am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:36:55 +00:00