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

181338 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
Zhen Yu Song
619ef3fe93 + Update api file. 
Change-Id: I1a2abb974c6a789c3533a44d3ceb70cf6701b9f9
 2015-01-29 16:28:18 -08:00
Christopher Tate
7af25c0515 am 7041420d: am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '7041420d9b0ca1e0f79157ccace48ac4e29adc29':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:21:25 +00:00
Christopher Ferris
58f1bf4c98 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-30 00:21:24 +00:00
Christopher Ferris
3c1fd311ff am 0654196f: am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
  Fix wrap property creation when truncating.
 2015-01-30 00:21:12 +00:00
Christopher Ferris
3f8d6c92ce am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
automerge: 0654196

* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
  Fix wrap property creation when truncating.
 2015-01-30 00:19:47 +00:00
Christopher Tate
7041420d9b am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:17:19 +00:00
Christopher Ferris
0654196fb0 am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
  Fix wrap property creation when truncating.
 2015-01-30 00:14:17 +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 Ferris
e7a69cbf92 am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit 'dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
  Fix wrap property creation when truncating.
 2015-01-29 23:51:16 +00:00
Zhijun He
043adafffd Merge "Camera2: metadata spec update for reprocessing" 2015-01-29 23:48:02 +00: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
Christopher Ferris
dbd03924d8 Merge "Fix wrap property creation when truncating." 2015-01-29 23:41:06 +00:00
Raph Levien
4319827fd4 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
automerge: c36d373

* commit 'c36d373733b8fb9683d40e404151110ed9c44ecf':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:29:04 +00:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing 
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
 2015-01-29 15:26:05 -08:00
Raph Levien
c36d373733 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit '61ff4d1debe013e9f81bb05f59356b133b6e4922':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:25:14 +00: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
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Jinsuk Kim
1b68ce327a am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
automerge: a6fc42a

* commit 'a6fc42aec58ab0d2dbb96f37d40e597bc39631fa':
  CEC: Discard key event to itself
 2015-01-29 22:46:33 +00:00
Jinsuk Kim
a6fc42aec5 am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
  CEC: Discard key event to itself
 2015-01-29 22:44:51 +00:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:41:23 +00: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
f0569c1651 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
automerge: e7ff01e

* commit 'e7ff01ecc5c0ceda498dd476cb29ee663f1968dc':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:39:52 +00:00
Raph Levien
98cb80d659 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
automerge: 35b5780

* commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:38:41 +00:00
Jinsuk Kim
7e79bdb494 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:37:01 +00:00
Jinsuk Kim
e7ff01ecc5 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '1ebbe9165842707fd575ea61b8158463f93c35be':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:36:55 +00:00
Raph Levien
35b5780ec5 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:36:46 +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
Zhen Yu Song
9d5528ba9f + Add CarExtender to Notification 
Bug: 18316420

Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
 2015-01-29 14:27:28 -08: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
Soonil Nagarkar
9f74b337b0 Merge "Fix FusionEngine so it isn't confused by location providers enabling/disabling." 2015-01-29 21:58:55 +00:00
Sanket Padawe
81f63a60f3 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:57:29 +00:00
Sanket Padawe
f19485b644 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
* commit '60e4edfb94fd744001b4c7013a89ef4abb311f97':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:56:04 +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
Mike Lockwood
51936d4260 Merge "UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects" 2015-01-29 21:33:32 +00:00
Mike Lockwood
61c9b44ca9 Merge "MidiManager: Add USB peripheral MIDI support" 2015-01-29 21:15:08 +00:00
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support 
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
 2015-01-29 12:59:28 -08:00
John Reck
49bc4acfad resolved conflicts for merge of fe5ac4fc to master 
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
 2015-01-29 12:53:38 -08:00