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

28504 Commits

Author SHA1 Message Date
Adam Lesinski
438fb54a26 am 91211df6: am e63d3144: am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit '91211df6551d73e18ff195c27dd1e441fc70b86f':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-24 04:03:06 +00:00
Svetoslav Ganov
1298b1a0a2 am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit '1ad413c0103df4a35428b13b61477aac17b5eda1':
  Add a privileged permission to get user accounts
 2015-07-24 04:02:42 +00:00
John Reck
27dcd05258 am e8b154a0: am 8fb2a4fa: am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit 'e8b154a05f6dbabbf9478b2fe7ac9cb014886585':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-24 04:02:35 +00:00
Nick Kralevich
a508d399e7 am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit '01e00c8ce01c9c9242843b3bc6cec52ad9d89dd2':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 04:02:23 +00:00
Jeff Sharkey
5080e90a62 am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
  More info to support CTS, fix reconcile bug.
 2015-07-24 04:01:46 +00:00
Jorim Jaggi
b3544372ba am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '929a82c81fe778319f04b03e73328724528c8521':
  Partially fix that beginning of animation is skipped
 2015-07-24 04:01:30 +00:00
Dianne Hackborn
1d8b0a29ab am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 04:01:24 +00:00
Adam Lesinski
e63d3144da am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit 'a403d5ccfb4a6e455c794ad73a5fa242883e244f':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-24 03:06:51 +00:00
Svetoslav Ganov
af27474fd5 am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit 'cc3c6dbf1e2f33f085c0b885df9653f54337bef6':
  Add a privileged permission to get user accounts
 2015-07-24 03:06:32 +00:00
John Reck
8fb2a4fae5 am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit '3328fe58a156f4b5452418f29f46e2d67dbcbd82':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-24 03:06:27 +00:00
Nick Kralevich
e4f10de7d2 am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit 'dd856a3f0df6e076b815ae208f000e28de235353':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 03:06:14 +00:00
Tim Kilbourn
cd03be66e8 am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit 'ad49498e91883099ffda2155e96ebaf495ba579a':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-24 03:06:04 +00:00
Jeff Sharkey
23fdb6355e am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'e87dc6dba58e55c60f387a86468a57a5109a97ac':
  More info to support CTS, fix reconcile bug.
 2015-07-24 03:05:42 +00:00
Jorim Jaggi
a0d142d942 am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
  Partially fix that beginning of animation is skipped
 2015-07-24 03:05:28 +00:00
Dianne Hackborn
63ff4a77f3 am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '419f2177c8565f80489d00463aea630568251f4d':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 03:05:22 +00:00
Zhentao Sun
6f52ee2592 am e965289b: am f26a9a20: am c6cd1f9a: Added service that listens for gestures. 
* commit 'e965289b57eb1782580bc5a6bc153d508b7176be':
  Added service that listens for gestures.
 2015-07-23 21:50:08 +00:00
Adrian Roos
a1d61552f9 am 2f1220c4: am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2f1220c419492825fd0d1b47f77b36d10afea6a7':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 21:50:01 +00:00
Dianne Hackborn
c9e454a544 am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '26b2453ca48b23177b8d692e3b1f9529a869211c':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 21:49:50 +00:00
Wale Ogunwale
c4597a90f9 am 6cd07625: am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '6cd07625ece8a89ac01a958eb082bdb58ccfbc97':
  Fixed issue with not finding existing activity for background user
 2015-07-23 21:49:36 +00:00
Jim Miller
a7bc2e0aef am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8c98f38676d9da5df54f7819d9391beb802ce0ec':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 21:49:07 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Adrian Roos
aebb144b3c am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'e674e9500c723848e896d281fc4bf45285689170':
  Touch, wake and unlock
 2015-07-23 21:48:42 +00:00
Zhentao Sun
f26a9a20ae am c6cd1f9a: Added service that listens for gestures. 
* commit 'c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
  Added service that listens for gestures.
 2015-07-23 19:21:29 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00
Dianne Hackborn
d363399b97 am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:21:14 +00:00
Wale Ogunwale
1aaf7d6cb9 am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'aecf9ba839d440fb89055bcb8454cf72d0afaf41':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:21:02 +00:00
Jim Miller
8cc0e80f06 am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '4a31ee0a745e048a2c9c4db1444404373c1d606b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:20:41 +00:00
Jorim Jaggi
fba926118e am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:20:27 +00:00
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00
Adam Lesinski
a403d5ccfb am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit '05f5cb45997fdc8831798bb84e50854cdfab2bcb':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-23 19:19:28 +00:00
Svetoslav Ganov
cc3c6dbf1e am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit '3d6f606031da248a3b1fd6f0f569ac33a26c0b5e':
  Add a privileged permission to get user accounts
 2015-07-23 19:19:14 +00:00
John Reck
3328fe58a1 am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit '3f2c51084b9d9578532c8a88e7a5444eeedc86c2':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-23 19:19:06 +00:00
Nick Kralevich
dd856a3f0d am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit '3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-23 19:18:55 +00:00
Tim Kilbourn
ad49498e91 am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit '1aadfc2bc46a14b6c95dc45ec11c4191cac5062d':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-23 19:18:46 +00:00
Jeff Sharkey
e87dc6dba5 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
 2015-07-23 19:18:25 +00:00
Jorim Jaggi
5091ca9c82 am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit 'ac73f1efea0cb23881571e18e87ffc7f388af7ad':
  Partially fix that beginning of animation is skipped
 2015-07-23 19:18:15 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Zhentao Sun
c6cd1f9a83 Added service that listens for gestures. 
Added the GestureLauncherService that listens for camera launch gesture
and starts the camera app.
OEMs need to specify the sensor type of the camera launch gesture in
their overlays.
In the future, we can add more gesture support in this service.

Change-Id: I0769e7ca71e08bd9159aacf29bdcefd316efd2f0
 2015-07-22 17:42:41 -07:00
Adrian Roos
58adc7ad48 Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 2015-07-22 23:22:42 +00:00
Adam Lesinski
e03f17c82e UsageStats: Gracefully handle corrupt filenames 
Not sure how useful this is, since renames should be atomic. If the filesystem
is corrupt I'm sure other parts of the system will break. Good to be safe though!

Bug:22172659
Change-Id: Iad339be2869d170bcf736c59feb93830a51905e1
 2015-07-22 16:01:45 -07:00
Svetoslav Ganov
3d6f606031 Merge "Add a privileged permission to get user accounts" into mnc-dev 2015-07-22 21:41:40 +00:00
John Reck
3f2c51084b Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 2015-07-22 21:29:55 +00:00
Nick Kralevich
3b0bbd7b96 Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 2015-07-22 21:18:59 +00:00
John Reck
c360bef7bc Fix ATLAS_MAP_ENTRY_FIELD_COUNT 
Bug: 22558805

Change a039182d6157bc0487df4ad8e373685c9dd7d662 reduced
the size of an entry from 4 fields to 3, but failed to
update the constant that determined the size of the java long[].

Because the long[] is blindly passed down through to native, this
will result in reading past the end of the array as the size
is no longer a multiple of the number of fields being read so
the loop will not terminate until 1 iteration past the end.

Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
 2015-07-22 20:58:09 +00:00
Tim Kilbourn
1aadfc2bc4 Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 2015-07-22 20:40:06 +00:00
Dianne Hackborn
8635041115 am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-22 20:24:30 +00:00
Wale Ogunwale
aecf9ba839 am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'ff21279e2cbe0bdd9c41350b7a204cabf9370377':
  Fixed issue with not finding existing activity for background user
 2015-07-22 20:24:10 +00:00
Jim Miller
4a31ee0a74 am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-22 20:23:41 +00:00
Jorim Jaggi
fcf9acb95a am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
 2015-07-22 20:22:56 +00:00
Nick Kralevich
b210026e3d UsbDeviceManager: fix b/21429947 regression 
As discussed in b/21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Get rid of one use of the persistent property. The persistent property
was already pulled from a number of devices, and as explained in
commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c, the intent was that
the persistent property would only hold the persistent adb state.

Bug: 22447614
Bug: 21429947
Change-Id: I8b3690a1bafb7cea0d5a69d73c1065c7fc64c653
 2015-07-22 12:59:47 -07:00