Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211,446 Commits 3 Branches 0 Tags
5bcd4477ddeeec3ccf334a3ab6e48f5e809622f8
Commit Graph

51249 Commits

Author SHA1 Message Date
Erik Kline
5bcd4477dd am 2a068606: am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit '2a06860609254ab07ac7c866d8a7435a4245a9f0':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:15:39 +00:00
Erik Kline
c89f3a4833 am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit '7aa79efe80b790eef61ac355c0ce6c7b606e6f78':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:00:25 +00:00
Erik Kline
7aa79efe80 Grab a wakelock while doing ARP/ND probing 
Bug: 23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
 2015-09-21 14:59:05 +09:00
Justin Harrison
46db0f2215 am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev 
* commit '08b004233537f625044b3f01e2923b600a9aa77c':
  Add support for setting color transforms
 2015-09-19 00:46:19 +00:00
Justin Harrison
1f46395702 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev 
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
  Add support for setting color transforms
 2015-09-19 00:29:40 +00:00
Justin Harrison
91f2123b2a Merge "Add support for setting color transforms" into mnc-dr-dev 2015-09-19 00:21:41 +00:00
Michael Wright
58e829f71d Add support for setting color transforms 
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
 2015-09-18 23:37:28 +00:00
Christine Hallstrom
c4f196b661 am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev 
* commit '039fd00fd2b499a871be8551d80d299120ff5595':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
 2015-09-18 22:06:38 +00:00
Christine Hallstrom
13c23df90c Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev 2015-09-18 21:29:09 +00:00
Christine Hallstrom
2eb7d4761e Manual 'cherry pick' to fix CTS tests for MediaControllerTest. 
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
 2015-09-18 21:27:38 +00:00
Adam Lesinski
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
 2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
 2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Alan Viverette
c602c57737 am 48c7e6f3: am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()" 
* commit '48c7e6f3dc0462f43657b6003e4ba4021b0544ed':
  prevent unnecessary warning logs caused by View.toString()
 2015-09-18 20:19:27 +00:00
Alan Viverette
48c7e6f3dc am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()" 
* commit '24ff6823c411f794aceaae89b0b029fbf8ef6b29':
  prevent unnecessary warning logs caused by View.toString()
 2015-09-18 20:11:44 +00:00
Alan Viverette
24ff6823c4 Merge "prevent unnecessary warning logs caused by View.toString()" 2015-09-18 19:59:20 +00:00
kenzyun_chen
90ebb99b36 prevent unnecessary warning logs caused by View.toString() 
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.

The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100

Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
 2015-09-18 18:30:30 +08:00
Tim Murray
0816319a29 am 4816ea0e: am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit '4816ea0e120fd4e2892d372f33c8ca21e4b2efb6':
  Send power hint on fling gestures.
 2015-09-17 02:51:39 +00:00
Tim Murray
a02f98239e am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
  Send power hint on fling gestures.
 2015-09-17 02:33:35 +00:00
Tim Murray
952d5b334c Merge "Send power hint on fling gestures." into mnc-dr-dev 2015-09-17 02:24:32 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures. 
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
 2015-09-17 00:18:13 +00:00
Fyodor Kupolov
fd464a301f am 71b4b738: am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 
* commit '71b4b738a611565659df33fe56635d75a25e6f19':
  Use app directory as apkPath for cluster installs
 2015-09-16 21:19:57 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
 2015-09-16 21:02:53 +00:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Chris Tate
9bf4d76579 am e46bf3f7: am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 
* commit 'e46bf3f7f25610a8839542af44eecbaf961892f6':
  Do not back up/restore the "pulse LED for notifications" setting
 2015-09-16 17:25:06 +00:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
 2015-09-16 17:11:19 +00:00
Chris Tate
3290f5dd06 Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 2015-09-16 17:05:07 +00:00
Jim Miller
4d3e0f8b33 am f84e0535: am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev 
* commit 'f84e0535aee45874cf022628c4959dd15c4b1bc5':
  Add logging to track fingerprint reco but not unlocking
 2015-09-15 21:38:11 +00:00
Christopher Tate
9cecf14783 Do not back up/restore the "pulse LED for notifications" setting 
Bug 24103790

Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
 2015-09-15 14:26:12 -07:00
Jim Miller
0dd1163af0 am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev 
* commit 'dca3b2f74f7979e87e2654baf83df42483ef4388':
  Add logging to track fingerprint reco but not unlocking
 2015-09-15 21:22:50 +00:00
Jim Miller
1adb4a7693 Add logging to track fingerprint reco but not unlocking 
Bug 23940153

Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
 2015-09-14 19:12:35 -07:00
Vinod Krishnan
f274e3252b am aae9c4ab: am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev 
* commit 'aae9c4ab35ac98e8106d6a57d9d094780fbb0189':
  Add some constants for Wear MNC Perms
 2015-09-14 22:36:29 +00:00
Vinod Krishnan
74c3a0e7b4 Merge "Add some constants for Wear MNC Perms" into cw-e-dev 2015-09-14 22:23:25 +00:00
Alex Hills
d04c6d19a5 resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp 
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
 2015-09-14 17:03:58 -04:00
Vinod Krishnan
61665cc4ae Add some constants for Wear MNC Perms 
- Add an API for getting list of apps that has runtime perms

Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
 2015-09-14 13:16:18 -07:00
Alexander Hills
6a261fd653 Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 2015-09-14 18:34:32 +00:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches 
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
 2015-09-14 10:56:02 -04:00
Alan Viverette
f9a75e1a84 am 7914680e: am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev 
* commit '7914680e1ec319f50cb99b6c761aace56fc6e3ed':
  Avoid OOBE when AbsListView layout is out of sync with adapter
 2015-09-11 23:30:34 +00:00
Alan Viverette
58c483fcff am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev 
* commit '62b94c353a8748ef10691da4844bf894e1155870':
  Avoid OOBE when AbsListView layout is out of sync with adapter
 2015-09-11 22:25:29 +00:00
Alan Viverette
62b94c353a Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev 2015-09-11 21:28:59 +00:00
Martijn Coenen
51e4b28c48 am 48093547: am 5c732ee5: am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit '4809354715aca3bd766250ce708a006a64753c62':
  Fix missing copyright headers.
 2015-09-10 21:41:23 +00:00
Martijn Coenen
5c732ee53e am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit 'e1d2d42289afe6e6a65d2ef420b8bf8ed2b33d3b':
  Fix missing copyright headers.
 2015-09-10 21:24:22 +00:00
Martijn Coenen
e1d2d42289 Merge "Fix missing copyright headers." into mnc-dr-dev 2015-09-10 21:17:56 +00:00
Shawn Willden
b63b8fb40a Update KeymasterDefs 
Change-Id: Iea788eb81c24dcaceeea35a6b004416caa1cf9c6
 2015-09-10 14:00:34 -06:00
Gus Prevas
94a4764649 am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev 
* commit '27cb56703d350b441a2e9efc55bd16dd5b1528e7':
  Fixes cloned notification actions missing icon.
 2015-09-10 19:54:13 +00:00
Gus Prevas
3d1115dba5 Merge "Fixes cloned notification actions missing icon." into cw-e-dev 2015-09-10 19:40:19 +00:00
Fyodor Kupolov
ebcac16cb1 Use app directory as apkPath for cluster installs 
Previously, size of of oat directory was not counted by the getsize command,
because base APK location was passed as apkpath argument.

Bug: 23896047
Change-Id: Ic7b6b725785ff2e2a0cf3887ba68c162b23b1212
 2015-09-10 10:44:49 -07:00
Gus Prevas
f5bff46f6a Fixes cloned notification actions missing icon. 
This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13
 2015-09-10 13:13:45 -04:00
Alan Viverette
a84dda54e4 Avoid OOBE when AbsListView layout is out of sync with adapter 
Views are not synchronized with adapter state until a layout pass
occurs, which may cause an OOBE if a list item is removed and an
accessibility node is obtained before the next layout pass.

This CL caches the item's enabled state on the bound view's layout
params, which allows us to avoid relying on the adapter to populate
accessibility nodes. It also aborts actions if the target position
is no longer valid.

Updates the documentation on AdapterView to reflect that the result
of getPositionForView() may not be synchronized with the adapter.

Bug: 23943664
Change-Id: I90ca946bead1d87a179eab1c2f482a54bcce9c38
 2015-09-10 15:17:11 +00:00
Jorim Jaggi
0fb3f695cc am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev 
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
  Add double-tap power button to open camera 1/2
 2015-09-10 01:06:47 +00:00