Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
d98e7c1df7 am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '7278b04383cb6c01c2fbb184c560875ab709dea5':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:35:46 +00:00
Amit Mahajan
7278b04383 am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '895eb134751ec1495baa30362a514275624e5843':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:18:01 +00:00
Amit Mahajan
895eb13475 am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:03:10 +00:00
Prashant Malani
9a3eacbe9c Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 2015-06-26 21:00:11 +00:00
Amit Mahajan
90224355cd DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
 2015-06-26 17:33:27 +00:00
Wei Liu
6f6326bc75 Implement a exponential backoff for NTP time and XTRA data retry. 
b/21904128

Change-Id: I9fc8917eed3065ff0a4946c5a3bdecb9e93da19d
 2015-06-25 21:12:58 -07:00
Prashant Malani
753e9e0f2d Revert "Always re-establish kernel alarms when considering new alarm set" 
This reverts commit c83d3e4b72.

While the above patch does help deal with the issue of "lost" kernel
alarms, experiments found it to also cause the unnecessary duplicate
setting of non-lost alarms in other devices.

This leads to a situation where the CPU constantly tries to sleep, but
occasionally keeps failing to do so, because of a collection of these
duplicate alarms constantly activating the "alarm" kernel wakeup source
, presumably due to them being triggered.

These might have accumulated over several iterations when the kernel
alarms were set again (via rescheduleKernelAlarmsLocked()).

To prevent the CPU thrashing (which heavily drains power on more
battery-constrained devices, and increases the number of alarms being
set), the aforementioned commit is backed out.

Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
(cherry picked from commit d19ffd4f2c)
 2015-06-24 23:41:57 +00:00
Anthony Hugh
001df9ca90 DO NOT MERGE: Introduce stem keycodes for Wear 
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
 2015-06-24 16:13:19 -07:00
Bryce Lee
65dca454c7 Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev 2015-06-23 18:10:41 +00:00
Sharvil Nanavati
7c2500564b Dump bonded Bluetooth devices in dumpsys. 
Change-Id: Ie509b0abc64cbc7813e9fe844ff4c05d8cb05f9d
 2015-06-22 13:01:47 -07:00
Filip Gruszczynski
dd91362c2c Make sure home activity gets resumed after started. 
When there is only one activity and it gets paused, activity manager will
try resuming some other activity. If there is no other activity, it will
start home activity and try to resume it. This will fail, because the
activity stack doesn't want to enter recursive resuming. We need to
detect this situation and schedule additional resume of top activity
after home gets started.

Bug: 21500945
Change-Id: I6ca703f8d97bcc4001e7da4cd5a5db63bfb5c861
 2015-06-19 15:40:47 -07:00
Bryce Lee
685ed12b5d Turn off theater mode upon power button press. 
Bug: 20032225
Change-Id: I80dee2981a8c4ccae5e02b56b7f4ef0f1bd6e169
 2015-06-18 14:39:14 -07:00
Wei Liu
ae363d2db4 Wear doesn't need Shell to send notification when bugreport captured. 
b/19179040

Change-Id: Iec74e1e55adee16c8674f28a6e7d697499b85acf
 2015-06-17 15:32:05 -07:00
Diego Perez
2f7103565c am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor
 2015-06-15 10:04:02 +00:00
Diego Perez
df6f63badf am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 10:03:58 +00:00
Diego Perez
13c06d6c91 am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor
 2015-06-15 09:50:58 +00:00
Diego Perez
2422011d86 am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 09:50:51 +00:00
Diego Perez
1f33bdad98 am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
  Fix for shadows on theme editor
 2015-06-15 09:36:39 +00:00
Diego Perez
b2411c622c am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'ead59b0d479c3a911be87261b523255e8e51f76a':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 09:36:34 +00:00
Diego Perez
5e50e00c66 Merge "Fix for shadows on theme editor" into lmp-mr1-dev 2015-06-15 08:35:00 +00:00
Diego Perez
ead59b0d47 Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 2015-06-15 08:34:04 +00:00
Diego Perez
d717682df9 am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit '5c597c1d89c529675096c2d326c452145403979d':
  New custom widgets library
 2015-06-12 15:10:18 +00:00
Diego Perez
c051c55666 am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit 'e10e8005903572158cbb9c7f869508a247ff51ad':
  Fix crash when shadowSize is 0
 2015-06-12 15:10:14 +00:00
Diego Perez
5c597c1d89 am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'a885456426ec267d37c6a527285d965f81e14f9d':
  New custom widgets library
 2015-06-12 14:57:35 +00:00
Diego Perez
e10e800590 am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit '68155986508ef8b497228f8e60346d317e87991d':
  Fix crash when shadowSize is 0
 2015-06-12 14:57:27 +00:00
Diego Perez
a885456426 am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'ce4a9d9110436a2ea825976af7895c58303a3dac':
  New custom widgets library
 2015-06-12 14:45:26 +00:00
Diego Perez
6815598650 am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit 'f5a99437bf203eca49e8ab8f74f2c206c551289b':
  Fix crash when shadowSize is 0
 2015-06-12 14:45:21 +00:00
Diego Perez
ce4a9d9110 Merge "New custom widgets library" into lmp-mr1-dev 2015-06-12 14:34:50 +00:00
Diego Perez
f5a99437bf Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 2015-06-12 14:34:09 +00:00
Prashant Malani
327b481f1f am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit '786cd12f785374f93c19c909687ea300e41ffbc2':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-11 23:52:49 +00:00
Prashant Malani
786cd12f78 Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 2015-06-11 23:36:44 +00:00
Prashant Malani
d19ffd4f2c DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set" 
This reverts commit c83d3e4b72.

While the above patch does help deal with the issue of "lost" kernel
alarms, experiments found it to also cause the unnecessary duplicate
setting of non-lost alarms in other devices.

This leads to a situation where the CPU constantly tries to sleep, but
occasionally keeps failing to do so, because of a collection of these
duplicate alarms constantly activating the "alarm" kernel wakeup source
, presumably due to them being triggered.

These might have accumulated over several iterations when the kernel
alarms were set again (via rescheduleKernelAlarmsLocked()).

To prevent the CPU thrashing (which heavily drains power on more
battery-constrained devices, and increases the number of alarms being
set), the aforementioned commit is backed out.

Bug: 20136729
Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
 2015-06-11 19:56:49 +00:00
Filip Gruszczynski
88bc9753c3 Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 2015-06-11 16:40:10 +00:00
Leon Scroggins III
265d053da9 am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '81babaa318bd004a97a35d7d6d9d57c0b7f75e5f':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-11 13:33:17 +00:00
Doris Liu
629ba0e2b3 DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes 
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.

Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9)
 2015-06-10 22:54:09 +00:00
Leon Scroggins III
303581be5b resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
Change-Id: I37a4be53f44035c1ff58ba6c4da3a14803b946c2
 2015-06-10 14:56:11 -04:00
Svetoslav
497176975f am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '34c7bd7c5ca5e41e151c93cd417efd7a28157e9d':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-10 16:34:39 +00:00
Leon Scroggins III
81babaa318 am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '7ffde4a6304dc4ad7de3154c12ce8bb0a8001a07':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:21:33 +00:00
Leon Scroggins III
3ff978a520 am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '77dde3cbd049e75ea7447d3413bf52dbfe8c6342':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:21:26 +00:00
Svetoslav
34c7bd7c5c am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '74e04083569ccdd8907a91cd54f5822b2ed8f18a':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-10 16:21:20 +00:00
Leon Scroggins III
7ffde4a630 am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit 'e899576f17ff50b2c509806f6080b0cf2df01014':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:06:51 +00:00
Leon Scroggins III
77dde3cbd0 am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '6b16398dd148b38da19a8d5d7f5598fa44fbe7ac':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:06:47 +00:00
Svetoslav
74e0408356 am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '07264d936d4039057277151641e66671c33ed1af':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-10 16:06:42 +00:00
Leon Scroggins III
e899576f17 am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '48b38452b0454a1398d01a5df9fe949e2febdeef':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 15:51:45 +00:00
Leon Scroggins III
6b16398dd1 am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '604ae32bcc6791da813a8e594783b695131bf888':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 15:51:38 +00:00
Svetoslav
07264d936d am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '18fb1c92d8c6ac732b85d7dee02a75591aec154b':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-10 15:51:38 +00:00
Filip Gruszczynski
47e5331950 Revert "Recompute focus stack if cleared while starting an activity." 
This reverts commit 0b3d573e46.

Unfortunately, we need more than just that.

Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01
 2015-06-09 15:55:30 +00:00
Wale Ogunwale
0b3d573e46 Recompute focus stack if cleared while starting an activity. 
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
(cherry picked from commit 86920fe630)
 2015-06-09 15:21:17 +00:00
Filip Gruszczynski
aaf1811dda Calculate outsets before window frame adjustment. 
Bug: 21635628
Change-Id: I2d818e6d543c885dca2d19553bad5ce1adda95a6
 2015-06-05 13:37:40 -07:00
Justin Harrison
4f2927d224 am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '0eeb3bb8eb211af642b25bc494931bcc47786be7':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-04 00:06:15 +00:00