OSDN Git Service
Filip Gruszczynski [Wed, 3 Jun 2015 17:32:26 +0000 (10:32 -0700)]
DO NOT MERGE - Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.
Bug:
21602590
Change-Id: I5860d5e7c20131e2650bdb8635e9659e76205fa1
(cherry picked from commit
e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
Filip Gruszczynski [Thu, 9 Jul 2015 01:06:40 +0000 (01:06 +0000)]
Revert "Fix NPE when requesting outsets for detached view."
This reverts commit
b010291ace13947fcc76b1a64eaa67880e15f0a6.
Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
Filip Gruszczynski [Wed, 3 Jun 2015 17:32:26 +0000 (10:32 -0700)]
Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.
Bug:
21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit
e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
Wale Ogunwale [Thu, 2 Jul 2015 01:22:06 +0000 (01:22 +0000)]
am
2735ac71: am
22cd16a0: am
bc4743eb: am
7ab264ab: am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
2735ac71e6d8d1c00b95104057ac9365abb485d9':
Prevent system uid component from running in an app process
Wale Ogunwale [Thu, 2 Jul 2015 01:07:44 +0000 (01:07 +0000)]
am
22cd16a0: am
bc4743eb: am
7ab264ab: am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
22cd16a01f55149507c1d5d71c408987a71737fc':
Prevent system uid component from running in an app process
Wale Ogunwale [Thu, 2 Jul 2015 00:50:52 +0000 (00:50 +0000)]
am
bc4743eb: am
7ab264ab: am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
bc4743ebe845958fab8bbb0d0a425d55ece3d205':
Prevent system uid component from running in an app process
Wale Ogunwale [Thu, 2 Jul 2015 00:37:02 +0000 (00:37 +0000)]
am
7ab264ab: am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
7ab264abc214b7e1b7fff9934814020cea5f18fa':
Prevent system uid component from running in an app process
Wale Ogunwale [Thu, 2 Jul 2015 00:35:51 +0000 (00:35 +0000)]
am
44000724: am
5278cea1: am
d72dc762: am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
44000724ef630182579004939d0c064664d9d3f2':
Prevent system uid component from running in an app process
Wale Ogunwale [Thu, 2 Jul 2015 00:35:47 +0000 (00:35 +0000)]
am
f54d1722: am
52034328: am
131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '
f54d17224bada1d852ba7c9d4bb9e2a792c0093b':
Prevent system uid component from running in an app process
Filip Gruszczynski [Wed, 1 Jul 2015 15:35:28 +0000 (08:35 -0700)]
Handle outsets when resized is called due to rotation.
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.
Bug:
22209764
Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
Wale Ogunwale [Wed, 1 Jul 2015 17:19:26 +0000 (17:19 +0000)]
am
5278cea1: am
d72dc762: am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
5278cea1f35b2b54606cc1bb78195bd2f84953da':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:19:20 +0000 (17:19 +0000)]
am
52034328: am
131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '
52034328081e8c3420f9228192343835465afa13':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:17:23 +0000 (17:17 +0000)]
am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
742bfa809cf2c022d690f84b4213e908ee66e8aa':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:58 +0000 (17:03 +0000)]
am
d72dc762: am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
d72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:54 +0000 (17:03 +0000)]
am
131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '
131e6b24d88c4704687f41e9a016ab1919c53fa4':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:02 +0000 (17:03 +0000)]
am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:39:11 +0000 (16:39 +0000)]
am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:35:21 +0000 (16:35 +0000)]
am
ec425a19: am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
ec425a19f973e2511485b61424dffb9f3cafb542':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:30:40 +0000 (16:30 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:18:42 +0000 (16:18 +0000)]
am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
df9948d81232a03271113c16bee6f3ab6b826bad':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:18:17 +0000 (16:18 +0000)]
am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
dc9cfca80139714ca37122148d041beedbf0ceb2':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:06:46 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:06:32 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into klp-dev
Filip Gruszczynski [Tue, 30 Jun 2015 22:02:32 +0000 (22:02 +0000)]
Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
Filip Gruszczynski [Tue, 30 Jun 2015 21:42:21 +0000 (14:42 -0700)]
Build fix after changing IWindowSession.
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
Amit Mahajan [Tue, 30 Jun 2015 21:40:32 +0000 (21:40 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 21:40:27 +0000 (21:40 +0000)]
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.
Amit Mahajan [Tue, 30 Jun 2015 21:23:41 +0000 (21:23 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 21:23:34 +0000 (21:23 +0000)]
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.
Amit Mahajan [Tue, 30 Jun 2015 20:11:48 +0000 (20:11 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 20:11:40 +0000 (20:11 +0000)]
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.
Amit Mahajan [Tue, 30 Jun 2015 20:00:00 +0000 (20:00 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 19:59:53 +0000 (19:59 +0000)]
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.
Amit Mahajan [Tue, 30 Jun 2015 19:45:08 +0000 (19:45 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 19:45:03 +0000 (19:45 +0000)]
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.
Filip Gruszczynski [Thu, 25 Jun 2015 18:26:01 +0000 (11:26 -0700)]
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
Amit Mahajan [Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)]
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.
Joe Fernandez [Tue, 30 Jun 2015 18:21:41 +0000 (18:21 +0000)]
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.
Bryce Lee [Tue, 30 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
Filip Gruszczynski [Mon, 29 Jun 2015 20:47:07 +0000 (20:47 +0000)]
Merge "Dump of previous vibrations." into cw-d-mr1-dev
Filip Gruszczynski [Fri, 26 Jun 2015 01:35:00 +0000 (18:35 -0700)]
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
Amit Mahajan [Fri, 26 Jun 2015 23:12:05 +0000 (23:12 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:55:18 +0000 (22:55 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:35:46 +0000 (22:35 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:34:59 +0000 (22:34 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:31:49 +0000 (22:31 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:19:29 +0000 (22:19 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:18:01 +0000 (22:18 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:14:24 +0000 (22:14 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:03:10 +0000 (22:03 +0000)]
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.
Prashant Malani [Fri, 26 Jun 2015 21:00:09 +0000 (21:00 +0000)]
Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wei Liu [Thu, 25 Jun 2015 06:47:50 +0000 (23:47 -0700)]
Implement a exponential backoff for NTP time and XTRA data retry.
b/
21904128
Change-Id: I9fc8917eed3065ff0a4946c5a3bdecb9e93da19d
Bryce Lee [Thu, 25 Jun 2015 17:54:06 +0000 (10:54 -0700)]
Only enable theater mode by button press after setup.
Bug:
21751167
Change-Id: I7f69ff767aaea97829e8eb6f5f13faace1aae416
Wale Ogunwale [Thu, 25 Jun 2015 16:29:58 +0000 (09:29 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
Prashant Malani [Thu, 11 Jun 2015 00:43:49 +0000 (17:43 -0700)]
Revert "Always re-establish kernel alarms when considering new alarm set"
This reverts commit
c83d3e4b72f8f25bbac39a577f125f0ca04354da.
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
d19ffd4f2ca4130c41dd5f6baddad1830598ecbc)
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
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
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Bryce Lee [Tue, 23 Jun 2015 18:10:39 +0000 (18:10 +0000)]
Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
Sharvil Nanavati [Sat, 20 Jun 2015 19:05:52 +0000 (12:05 -0700)]
Dump bonded Bluetooth devices in dumpsys.
Change-Id: Ie509b0abc64cbc7813e9fe844ff4c05d8cb05f9d
Joe Fernandez [Fri, 19 Jun 2015 23:01:45 +0000 (23:01 +0000)]
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.
Joe Fernandez [Fri, 19 Jun 2015 22:49:26 +0000 (22:49 +0000)]
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
Filip Gruszczynski [Fri, 19 Jun 2015 22:14:53 +0000 (15:14 -0700)]
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
Bryce Lee [Thu, 18 Jun 2015 21:39:14 +0000 (14:39 -0700)]
Turn off theater mode upon power button press.
Bug:
20032225
Change-Id: I80dee2981a8c4ccae5e02b56b7f4ef0f1bd6e169
Wei Liu [Sat, 13 Jun 2015 01:06:46 +0000 (18:06 -0700)]
Wear doesn't need Shell to send notification when bugreport captured.
b/
19179040
Change-Id: Iec74e1e55adee16c8674f28a6e7d697499b85acf
Diego Perez [Mon, 15 Jun 2015 10:04:02 +0000 (10:04 +0000)]
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
Diego Perez [Mon, 15 Jun 2015 10:03:58 +0000 (10:03 +0000)]
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.
Diego Perez [Mon, 15 Jun 2015 09:50:58 +0000 (09:50 +0000)]
am
1f33bdad: am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
1f33bdad98dd5138f887642d39c9495e1d7df14b':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 09:50:51 +0000 (09:50 +0000)]
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.
Diego Perez [Mon, 15 Jun 2015 09:36:39 +0000 (09:36 +0000)]
am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 09:36:34 +0000 (09:36 +0000)]
am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
ead59b0d479c3a911be87261b523255e8e51f76a':
Fix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Mon, 15 Jun 2015 08:34:56 +0000 (08:34 +0000)]
Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:01 +0000 (08:34 +0000)]
Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
Diego Perez [Fri, 12 Jun 2015 15:10:18 +0000 (15:10 +0000)]
am
5c597c1d: am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
5c597c1d89c529675096c2d326c452145403979d':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 15:10:14 +0000 (15:10 +0000)]
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
Diego Perez [Fri, 12 Jun 2015 14:57:35 +0000 (14:57 +0000)]
am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
a885456426ec267d37c6a527285d965f81e14f9d':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 14:57:27 +0000 (14:57 +0000)]
am
68155986: am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
68155986508ef8b497228f8e60346d317e87991d':
Fix crash when shadowSize is 0
Diego Perez [Fri, 12 Jun 2015 14:45:26 +0000 (14:45 +0000)]
am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
ce4a9d9110436a2ea825976af7895c58303a3dac':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 14:45:21 +0000 (14:45 +0000)]
am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
f5a99437bf203eca49e8ab8f74f2c206c551289b':
Fix crash when shadowSize is 0
Diego Perez [Fri, 12 Jun 2015 14:34:48 +0000 (14:34 +0000)]
Merge "New custom widgets library" into lmp-mr1-dev
Diego Perez [Fri, 12 Jun 2015 14:34:08 +0000 (14:34 +0000)]
Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
Prashant Malani [Thu, 11 Jun 2015 23:52:49 +0000 (23:52 +0000)]
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"
Prashant Malani [Thu, 11 Jun 2015 23:36:42 +0000 (23:36 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
Prashant Malani [Thu, 11 Jun 2015 00:43:49 +0000 (17:43 -0700)]
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
This reverts commit
c83d3e4b72f8f25bbac39a577f125f0ca04354da.
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
Filip Gruszczynski [Thu, 11 Jun 2015 16:40:08 +0000 (16:40 +0000)]
Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
Leon Scroggins III [Thu, 11 Jun 2015 13:33:17 +0000 (13:33 +0000)]
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
Doris Liu [Mon, 11 May 2015 20:23:31 +0000 (13:23 -0700)]
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
d7444427d9f44b6b7448d4c21edca866132c8b59)
Leon Scroggins III [Wed, 10 Jun 2015 18:54:02 +0000 (14:54 -0400)]
resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
Change-Id: I37a4be53f44035c1ff58ba6c4da3a14803b946c2
Svetoslav [Wed, 10 Jun 2015 16:34:39 +0000 (16:34 +0000)]
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.
Leon Scroggins III [Wed, 10 Jun 2015 16:21:33 +0000 (16:21 +0000)]
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
Leon Scroggins III [Wed, 10 Jun 2015 16:21:26 +0000 (16:21 +0000)]
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
Svetoslav [Wed, 10 Jun 2015 16:21:20 +0000 (16:21 +0000)]
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.
Leon Scroggins III [Wed, 10 Jun 2015 16:06:51 +0000 (16:06 +0000)]
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
Leon Scroggins III [Wed, 10 Jun 2015 16:06:47 +0000 (16:06 +0000)]
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
Svetoslav [Wed, 10 Jun 2015 16:06:42 +0000 (16:06 +0000)]
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.
Leon Scroggins III [Wed, 10 Jun 2015 15:51:45 +0000 (15:51 +0000)]
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