Amit Mahajan
71699d760e
am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:40:32 +00:00
Joe Fernandez
cbbbabaa4a
am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:40:27 +00:00
Amit Mahajan
95c47354a6
am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '43d3bd027604f400caf49826e5b4705784937b35':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 21:23:41 +00:00
Joe Fernandez
4c8ecd9a70
am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '72356f0b20d4e6d84430629c2bb7d8baac55002d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 21:23:34 +00:00
Amit Mahajan
43d3bd0276
am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '8363104782302c08f2f03d4e1e345edb7f20876c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 20:11:48 +00:00
Joe Fernandez
72356f0b20
am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit 'f1686ac225c75991d931348818065f9e99cf0b73':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 20:11:40 +00:00
Amit Mahajan
8363104782
am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 20:00:00 +00:00
Joe Fernandez
f1686ac225
am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 19:59:53 +00:00
Amit Mahajan
22766e85d8
am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 19:45:08 +00:00
Joe Fernandez
88c2d704c3
am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 19:45:03 +00:00
Filip Gruszczynski
0ec1328f85
Calculate outset hint when adding window.
...
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.
Bug: 21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
2015-06-30 12:42:17 -07:00
Amit Mahajan
bcf9223b3b
am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-30 18:21:50 +00:00
Joe Fernandez
4bd25634f1
am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '765255b41229553842da855b8e5d9dfa87cf8e2b':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-30 18:21:41 +00:00
Bryce Lee
cc2ba2200d
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
2015-06-30 17:13:04 +00:00
Filip Gruszczynski
b6c158f9d8
Merge "Dump of previous vibrations." into cw-d-mr1-dev
2015-06-29 20:47:10 +00:00
Filip Gruszczynski
3a8eb0f670
Dump of previous vibrations.
...
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.
Bug: 21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
2015-06-29 09:28:32 -07:00
Amit Mahajan
ad6a2da848
am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '2da8a992cb2afc25ac6df84da449944ea08f0c57':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 23:12:05 +00:00
Amit Mahajan
2da8a992cb
am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit 'b98f786c8acfaed27ee733dde0aa0fd255a09afc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:55:18 +00:00
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
b98f786c8a
am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '5b8976a5eaffe81a742ec2600cf9b63e911f978c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:34:59 +00:00
Amit Mahajan
23444e76d2
am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:31:49 +00:00
Amit Mahajan
5b8976a5ea
am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:19:29 +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
eee8634271
am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '9edf7ad563ead119698ac3106b699515bd160ffe':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:14:24 +00:00
Amit Mahajan
853c617883
am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:03:46 +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
791dd2c674
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:37 +00:00
Amit Mahajan
9edf7ad563
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:32 +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
Bryce Lee
cb8f188191
Only enable theater mode by button press after setup.
...
Bug: 21751167
Change-Id: I7f69ff767aaea97829e8eb6f5f13faace1aae416
2015-06-25 10:54:06 -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
Joe Fernandez
765255b412
am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
...
* commit '6f8dab04572c772decef9b7ec5380f8e240a51ce':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
2015-06-19 23:01:45 +00:00
Joe Fernandez
6f8dab0457
Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
2015-06-19 22:49:29 +00: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