Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,022 Commits 3 Branches 0 Tags
a403d5ccfb4a6e455c794ad73a5fa242883e244f
Commit Graph

198022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adrian Roos
6857305f91 am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '7748ea5fcd0fc32eeae1475e1871835a5aa39a5a':
  Protect demo mode commands with permission
 2015-07-23 19:19:23 +00:00
Jae Seo
d8162e47a3 am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'eec3d9e368328d6ca6942ae2fbd94711ecd7adc8':
  TIF: Enable hardware acceleration on overlay
 2015-07-23 19:19:19 +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
Adam Lesinski
92638a0ca9 am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '6625047a3ba26ecc52bb2757eb7576027949e435':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-23 19:18:59 +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
Chris Wren
e6deaca693 am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'db2b4ba69db391c3703277ccb986524c072be5f5':
  Don't crash sysui when advisory calls fail.
 2015-07-23 19:18:50 +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
Alan Viverette
be01800d76 am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-23 19:18:42 +00:00
Fyodor Kupolov
2a37b2fff2 am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
  Added a note about location permission
 2015-07-23 19:18:34 +00:00
xin He
13bb68122f am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '15a45e02c3372ad5deae0a260f782cd3e5a81d58':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-23 19:18:30 +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
Jason Monk
7254832501 am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-23 19:18:20 +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
Adam Lesinski
05f5cb4599 Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 2015-07-22 23:41:39 +00:00
Adrian Roos
58adc7ad48 Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 2015-07-22 23:22:42 +00:00
Adrian Roos
7748ea5fcd Merge "Protect demo mode commands with permission" into mnc-dev 2015-07-22 23:10:09 +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
Jae Seo
eec3d9e368 Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 2015-07-22 22:22:32 +00: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
Adam Lesinski
6625047a3b Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 2015-07-22 21:28:37 +00:00
Nick Kralevich
3b0bbd7b96 Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 2015-07-22 21:18:59 +00:00
Chris Wren
db2b4ba69d Merge "Don't crash sysui when advisory calls fail." into mnc-dev 2015-07-22 21:18:40 +00:00
Chris Wren
26505585a4 Don't crash sysui when advisory calls fail. 
Bug: 22653721
Change-Id: I8e2fc3887b7c71f99eb02306ce308f722dba4d07
 2015-07-22 17:03:17 -04:00
John Reck
c360bef7bc Fix ATLAS_MAP_ENTRY_FIELD_COUNT 
Bug: 22558805

Change a039182d61 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
Adam Lesinski
8a83c61497 BatteryStats: Use English locale for dump and checkin data 
Dump and checkin data is read by tools that expect a consistent
locale.

Bug:22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
 2015-07-22 13:50:23 -07:00
Fred Chung
9478ddfa11 am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'db71828cb7bff983bd758e986b65731cb0a5b2f6':
  Doc change: add note about not exiting on onPause().
 2015-07-22 20:41:41 +00:00
Tim Kilbourn
1aadfc2bc4 Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 2015-07-22 20:40:06 +00:00
Alan Viverette
9478bf0e6f Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 2015-07-22 20:35:40 +00:00
Fyodor Kupolov
5ef70b02ea Merge "Added a note about location permission" into mnc-dev 2015-07-22 20:27: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
Alex Klyubin
568e67a322 am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'ada70be897fb7541129f1ab1f6faa94a80fca986':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-22 20:24:21 +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
Kenny Guy
2adcb40d2c am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.
 2015-07-22 20:24:05 +00:00
Jason Monk
1df7e13519 am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
 2015-07-22 20:24:00 +00:00
Jason Monk
67091f46fa am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
 2015-07-22 20:23:55 +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
Svetoslav Ganov
010b53c029 am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'bdb7d936512a39b6c06411d11a26824b82e5727f':
  Update permission icons to final versions - framework
 2015-07-22 20:23:28 +00:00
George Mount
27fbd360a8 am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-22 20:23:02 +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
674019065b), 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 fcf10f7c12, 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
xin He
15a45e02c3 Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 2015-07-22 19:47:53 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Alan Viverette
5b39ec8b40 Fix handling of RelativeLayout measurement using UNSPECIFIED spec 
Bug: 22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
 2015-07-22 15:37:14 -04:00
Jae Seo
345af96677 TIF: Enable hardware acceleration on overlay 
Bug: 18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
 2015-07-22 12:34:17 -07:00
Jason Monk
4fc1b70744 Merge changes from topic 'TunerLoc' into mnc-dev 
* changes:
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-22 19:29:59 +00:00