OSDN Git Service
Luan Nguyen [Thu, 11 Dec 2014 03:04:14 +0000 (03:04 +0000)]
am
25964a85: am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index. automerge:
75ec24e
* commit '
25964a854a0f41a74136c7dbc1c459ba6ef0e20b':
docs: Fix link for moved Android Studio index.
Luan Nguyen [Thu, 11 Dec 2014 02:54:57 +0000 (02:54 +0000)]
am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index.
automerge:
75ec24e
* commit '
75ec24e26900fa6e0def1f5e946be41614d8e520':
docs: Fix link for moved Android Studio index.
Dianne Hackborn [Thu, 11 Dec 2014 02:05:11 +0000 (02:05 +0000)]
am
84adc43a: Merge "Fix issue #
18706195: Improve label names of memory types" into lmp-mr1-dev
* commit '
84adc43a70302278eea4d9c198e14c88d6432f9c':
Fix issue #
18706195: Improve label names of memory types
Dianne Hackborn [Thu, 11 Dec 2014 01:58:50 +0000 (01:58 +0000)]
Merge "Fix issue #
18706195: Improve label names of memory types" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 01:23:06 +0000 (01:23 +0000)]
am
eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
* commit '
eb2dcc791e649e07ec8114e00752b54965c46e65':
Don't preload textures for AssetAtlas
John Reck [Thu, 11 Dec 2014 01:12:29 +0000 (01:12 +0000)]
Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 00:47:36 +0000 (16:47 -0800)]
Don't preload textures for AssetAtlas
Bug:
18317479
RenderNode::prepareSubTree calls prefetchAndMarkInUse
on every bitmapResoruce in the DisplayList. However,
this resulted in textures being uploaded for bitmaps
that would be drawn from the AssetAtlas instead.
To fix this we teach TextureCache about the AssetAtlas
so that calls to TextureCache return the Texture from
AssetAtlas if it exists. Thus usage of AssetAtlas
is now purely to allow for further optimizations via
draw merging instead of a requirement to get
any benefit at all.
Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
Dianne Hackborn [Thu, 11 Dec 2014 00:06:10 +0000 (16:06 -0800)]
Fix issue #
18706195: Improve label names of memory types
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
Alan Viverette [Thu, 11 Dec 2014 00:36:19 +0000 (00:36 +0000)]
Alan Viverette [Thu, 11 Dec 2014 00:28:43 +0000 (16:28 -0800)]
Fix build
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
Alan Viverette [Thu, 11 Dec 2014 00:29:51 +0000 (00:29 +0000)]
am
4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
* commit '
4e1374378d41f15cefc1f5889fd4d549461485ff':
Update tint filter after setting gradient drawable state
Alan Viverette [Thu, 11 Dec 2014 00:23:32 +0000 (00:23 +0000)]
Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
Winson Chung [Thu, 11 Dec 2014 00:03:21 +0000 (00:03 +0000)]
am
e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug
18574950)" into lmp-mr1-dev
* commit '
e405e59e5b10aaf64c5f10e1336f43e092ce390b':
Fixing major regressions in Recents with multi-user. (Bug
18574950)
Alan Viverette [Thu, 11 Dec 2014 00:00:43 +0000 (16:00 -0800)]
Update tint filter after setting gradient drawable state
BUG:
18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
Winson Chung [Wed, 10 Dec 2014 23:54:38 +0000 (23:54 +0000)]
Merge "Fixing major regressions in Recents with multi-user. (Bug
18574950)" into lmp-mr1-dev
Shishir Agrawal [Wed, 10 Dec 2014 23:36:24 +0000 (23:36 +0000)]
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
automerge:
951dcdd
* commit '
951dcdd9404054f6b7e794b18aad6f50e44732f9':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
Shishir Agrawal [Wed, 10 Dec 2014 23:19:14 +0000 (23:19 +0000)]
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
Amith Yamasani [Wed, 10 Dec 2014 23:18:26 +0000 (23:18 +0000)]
am
ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev
* commit '
ee24d848a5f270fb2d18150ab14200e62c9fd118':
Stop guest user on exiting, to conserve resources
Winson Chung [Tue, 9 Dec 2014 01:26:44 +0000 (17:26 -0800)]
Fixing major regressions in Recents with multi-user. (Bug
18574950)
In the process of front-loading a lot of the loading work, we moved logic
into AlternateRecentsComponent, which is not multi-user friendly. This CL
proxies all the necessary events for non-primary users to their own SystemUI
process to ensure that they handle them correctly, and proxies visibility
changes back to the primary user (since that is the only process with the
right callbacks).
Change-Id: I9fed92214ac4d4e2309ad6ffc35d09b5726c2880
Amith Yamasani [Wed, 10 Dec 2014 22:54:27 +0000 (22:54 +0000)]
Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev
Dmitriy Ivanov [Wed, 10 Dec 2014 22:31:40 +0000 (22:31 +0000)]
am
cd13ae76: Merge "Switch to libsigchain.a" into lmp-mr1-dev
* commit '
cd13ae76a54a2cd7f20730579486834c326fa272':
Switch to libsigchain.a
Dmitriy Ivanov [Wed, 10 Dec 2014 22:24:44 +0000 (22:24 +0000)]
Merge "Switch to libsigchain.a" into lmp-mr1-dev
Amith Yamasani [Tue, 9 Dec 2014 20:30:04 +0000 (12:30 -0800)]
Stop guest user on exiting, to conserve resources
Bug:
18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
Luan Nguyen [Wed, 10 Dec 2014 22:12:20 +0000 (22:12 +0000)]
am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index.
* commit '
7e1b348ac55d4368172809031808a39576d00eea':
docs: Fix link for moved Android Studio index.
Alan Viverette [Wed, 10 Dec 2014 22:12:04 +0000 (22:12 +0000)]
am
6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
* commit '
6c42ee470307eee56a21062ad67b67878aa9392d':
Always call onDateChanged() when the date picker selection changes
Alan Viverette [Wed, 10 Dec 2014 22:06:12 +0000 (22:06 +0000)]
Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
Luan Nguyen [Wed, 10 Dec 2014 22:04:20 +0000 (22:04 +0000)]
am
4221d7e4: docs: Fix link for moved Android Studio index.
* commit '
4221d7e4cbcea9ea6be56322c7839f31b2afb828':
docs: Fix link for moved Android Studio index.
Dianne Hackborn [Wed, 10 Dec 2014 21:59:39 +0000 (21:59 +0000)]
am
e207ffe0: Merge "Fix issue #
18683980: questions on LMK memory changes" into lmp-mr1-dev
* commit '
e207ffe01d3e9185f2cac9501354a5236abcedad':
Fix issue #
18683980: questions on LMK memory changes
Alan Viverette [Wed, 10 Dec 2014 21:59:32 +0000 (21:59 +0000)]
am
62b780e8: Avoid creating futures for drawables with no constant state
* commit '
62b780e85ff2fcefd4324c3bfbf49b14963cf58b':
Avoid creating futures for drawables with no constant state
Dianne Hackborn [Wed, 10 Dec 2014 21:56:07 +0000 (21:56 +0000)]
Merge "Fix issue #
18683980: questions on LMK memory changes" into lmp-mr1-dev
Alan Viverette [Wed, 10 Dec 2014 21:52:28 +0000 (13:52 -0800)]
Avoid creating futures for drawables with no constant state
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.
Rider: Also fixes elevations again.
BUG:
18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
Luan Nguyen [Wed, 10 Dec 2014 21:42:05 +0000 (13:42 -0800)]
docs: Fix link for moved Android Studio index.
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
Adam Lesinski [Wed, 10 Dec 2014 21:19:58 +0000 (21:19 +0000)]
am
c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
* commit '
c78018774503308e8c8266f6769c9e4c895f3a97':
Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
Adam Lesinski [Wed, 10 Dec 2014 21:12:02 +0000 (21:12 +0000)]
Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
Jason Monk [Wed, 10 Dec 2014 21:11:30 +0000 (21:11 +0000)]
am
4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
* commit '
4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
Handle policy change while keyguard disabled
Jason Monk [Wed, 10 Dec 2014 21:04:24 +0000 (21:04 +0000)]
Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
Chris Craik [Wed, 10 Dec 2014 21:01:30 +0000 (21:01 +0000)]
am
f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev
* commit '
f441557d89cab8885940bb63a27159f576749f96':
Fix frame-allocated path lifecycles
Chris Craik [Wed, 10 Dec 2014 20:53:45 +0000 (20:53 +0000)]
Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev
Benjamin Franz [Wed, 10 Dec 2014 20:34:36 +0000 (20:34 +0000)]
am
a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
* commit '
a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
Only add successfully bound profile services to mProfileServices.
Benjamin Franz [Wed, 10 Dec 2014 20:29:22 +0000 (20:29 +0000)]
Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
Chris Craik [Wed, 10 Dec 2014 00:54:03 +0000 (16:54 -0800)]
Fix frame-allocated path lifecycles
bug:
18667472
Previously, we were allocating per-frame temporary paths within the
PlaybackStateStruct, but these are not safe as layers allocate these
transiently. Instead, move these to the OpenGLRenderer, which has
better define lifecycle.
Additionally, don't store SkPath objects directly in vector, since
they are then subject to relocation.
Change-Id: I8187ef542fcd5b030502bb75eb123ee26c0daa96
Joe Fernandez [Wed, 10 Dec 2014 20:02:29 +0000 (20:02 +0000)]
am
844af56b: am
efab8b6f: am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
844af56b85260d9e6a8e89436a5e8862fbeb3812':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:54:51 +0000 (19:54 +0000)]
am
efab8b6f: am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:54:35 +0000 (19:54 +0000)]
am
5a64a475: am
9727d191: am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
5a64a47580e9b384e83ba81e8f2cbb848497ac61':
docs:studio basic links
Joe Fernandez [Wed, 10 Dec 2014 19:47:11 +0000 (19:47 +0000)]
am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
bdd6aabd1fd98762b22bb347d24c99e2c388d166':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:46:37 +0000 (19:46 +0000)]
am
9727d191: am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
9727d1910052e600ebcf417c9fe55436ecf2c9de':
docs:studio basic links
Svet Ganov [Wed, 10 Dec 2014 19:42:08 +0000 (19:42 +0000)]
am
e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev
* commit '
e39fc96c04a09a58acb2547a2066e0662791a69b':
Ignore accessibility overlay when computing window's interactive region.
Joe Fernandez [Wed, 10 Dec 2014 19:38:28 +0000 (19:38 +0000)]
am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
d49977d967d7db24466abba9a97084a955f56aff':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:38:17 +0000 (19:38 +0000)]
am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
534ae165f374d81335dc1b7742df1168c8d5ae36':
docs:studio basic links
Svet Ganov [Wed, 10 Dec 2014 19:35:03 +0000 (19:35 +0000)]
Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev
Luan Nguyen [Wed, 10 Dec 2014 19:34:30 +0000 (19:34 +0000)]
am
596d4e72: am
c9e5c5f7: am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
596d4e7230ae1858aaafbae7987e46d65181f1bd':
docs: Fix text on step 5 of the opt-in steps
Joe Fernandez [Wed, 10 Dec 2014 19:31:10 +0000 (19:31 +0000)]
Merge "docs: update debug menu for debugging-studio" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:30:37 +0000 (19:30 +0000)]
am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
3454091dad65256730b714d8ce0f89c137c1c0c2':
docs:studio basic links
Luan Nguyen [Wed, 10 Dec 2014 19:26:37 +0000 (19:26 +0000)]
am
c9e5c5f7: am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
c9e5c5f72a563c7b8e030a57cf586941d32006f4':
docs: Fix text on step 5 of the opt-in steps
Alan Viverette [Wed, 10 Dec 2014 19:24:27 +0000 (11:24 -0800)]
Always call onDateChanged() when the date picker selection changes
BUG:
18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
Joe Fernandez [Wed, 10 Dec 2014 19:23:15 +0000 (19:23 +0000)]
Merge "docs:studio basic links" into lmp-docs
John Spurlock [Wed, 10 Dec 2014 19:22:41 +0000 (19:22 +0000)]
am
e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev
* commit '
e03e245610c7f406a6cc0de998d71313a285953a':
NoMan: Apply audio restrictions when effects are disabled by listeners.
Luan Nguyen [Wed, 10 Dec 2014 19:19:05 +0000 (19:19 +0000)]
am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
8a65df39e6ad2fc357c8a327626f40588ce00553':
docs: Fix text on step 5 of the opt-in steps
John Spurlock [Wed, 10 Dec 2014 19:14:25 +0000 (19:14 +0000)]
Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev
Rich Slogar [Tue, 9 Dec 2014 01:25:48 +0000 (17:25 -0800)]
docs: update debug menu for debugging-studio
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
Luan Nguyen [Wed, 10 Dec 2014 19:10:41 +0000 (19:10 +0000)]
am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
258da738463f547eab859c21d32cbfe0f8345ae2':
docs: Fix text on step 5 of the opt-in steps
John Spurlock [Wed, 10 Dec 2014 17:47:01 +0000 (12:47 -0500)]
NoMan: Apply audio restrictions when effects are disabled by listeners.
Bug:
17990185
Change-Id: Id946fab4dd27e2354919de6a98c009bc2e711240
Adam Lesinski [Wed, 10 Dec 2014 18:47:53 +0000 (10:47 -0800)]
Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder
was used. If the resource ID of an attribute was also 0x00000000 (which occurs with
non-resource attributes, like 'style'), then it would be mistaken as the sentinel
start value.
Bug:
18421787
Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
Dianne Hackborn [Wed, 10 Dec 2014 18:45:20 +0000 (18:45 +0000)]
am
d6372242: Merge "Further work on issue #
18640385: Add procstats test mode" into lmp-mr1-dev
* commit '
d63722429e311eca2ec9e9a9f80704bc521fef54':
Further work on issue #
18640385: Add procstats test mode
Dianne Hackborn [Wed, 10 Dec 2014 18:37:49 +0000 (18:37 +0000)]
Merge "Further work on issue #
18640385: Add procstats test mode" into lmp-mr1-dev
Luan Nguyen [Wed, 10 Dec 2014 18:37:43 +0000 (10:37 -0800)]
docs: Fix text on step 5 of the opt-in steps
Bug:
18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
Geoff Mendal [Wed, 10 Dec 2014 18:37:38 +0000 (18:37 +0000)]
am
5431d1e9: (-s ours) am
2bb00d52: (-s ours) Import translations. DO NOT MERGE
* commit '
5431d1e9a4ad23debe007693f0be2dc8c31fa9e2':
Import translations. DO NOT MERGE
Dianne Hackborn [Wed, 10 Dec 2014 18:33:27 +0000 (10:33 -0800)]
Further work on issue #
18640385: Add procstats test mode
Tune sampling periods:
- Lower minimum sample interval when in test mode.
- Add a check when sampling pss to make sure this is at least 1
second since the pss changed, to reduce the amount of bad
data (very small pss samples) that we see.
Change-Id: I624a7d0480f3f6b22d229744e028d13a2c7b0e89
Geoff Mendal [Wed, 10 Dec 2014 18:31:30 +0000 (18:31 +0000)]
am
2bb00d52: (-s ours) Import translations. DO NOT MERGE
* commit '
2bb00d5254b69d903728322cdd79fa2ce0fa491b':
Import translations. DO NOT MERGE
Dmitriy Ivanov [Mon, 20 Oct 2014 21:14:39 +0000 (14:14 -0700)]
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
(cherry picked from commit
5ba317cee071b718a163ab9acf2b6b4f6a337b39)
Bug:
18701723
Change-Id: Id9b567a1529574eab2225777f1f2a5ea10e540ad
Rich Slogar [Wed, 10 Dec 2014 18:04:26 +0000 (10:04 -0800)]
docs:studio basic links
Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1
Wink Saville [Wed, 10 Dec 2014 18:01:31 +0000 (18:01 +0000)]
am
eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev
* commit '
eb4de87683a0d1959d64af08f3685e1b3701a314':
Update API and documentation for invalid subscriptions id's
Wink Saville [Wed, 10 Dec 2014 17:56:56 +0000 (17:56 +0000)]
Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev
Dianne Hackborn [Wed, 10 Dec 2014 17:56:48 +0000 (09:56 -0800)]
Fix issue #
18683980: questions on LMK memory changes
Getting the denominator right is kind of important.
Change-Id: Iff02a0a95eccd1231042e4ea96011c8cee0fee02
Dianne Hackborn [Wed, 10 Dec 2014 17:29:35 +0000 (17:29 +0000)]
am
6bdbae07: Merge "Fix issue #
18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
* commit '
6bdbae07cf9b3929dca471072bea7001f7996efb':
Fix issue #
18665625 CTS:android.app.cts.InstrumentationTest#...
Dianne Hackborn [Wed, 10 Dec 2014 17:23:04 +0000 (17:23 +0000)]
Merge "Fix issue #
18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 17:15:49 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 10 Dec 2014 17:13:28 +0000 (09:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5bd1364488d92127594b2f8d6d39ae9b18495be1
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 17:13:19 +0000 (17:13 +0000)]
am
295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
295dc00409b295d4353eefa6131189a83a29ea5f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 17:07:22 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Benjamin Franz [Tue, 9 Dec 2014 18:58:45 +0000 (18:58 +0000)]
Only add successfully bound profile services to mProfileServices.
This causes crashes on all devices that disable the BluetoothHeadset
service when disabling bluetooth and thereby trying to unbind all
services.
Bug:
18669882
Change-Id: I48978a1556ead967c848c5bd9f6e001d38754b8d
Geoff Mendal [Wed, 10 Dec 2014 17:03:48 +0000 (09:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3a7d9612bf4b18c14981c0a9e115fc4d320069d6
Auto-generated-cl: translation import
Craig Mautner [Wed, 10 Dec 2014 17:02:10 +0000 (17:02 +0000)]
am
7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
* commit '
7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
Add put/getBoolean/Array to PersistableBundle
Craig Mautner [Wed, 10 Dec 2014 16:56:13 +0000 (16:56 +0000)]
Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 16:40:30 +0000 (08:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 10 Dec 2014 16:40:09 +0000 (16:40 +0000)]
am
c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
* commit '
c79343ce6545a78fd7673f05ec0a41209be9b27d':
Fix SysUI when an app started from the affordances crashes
Jorim Jaggi [Wed, 10 Dec 2014 16:32:18 +0000 (16:32 +0000)]
Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
Jorim Jaggi [Mon, 8 Dec 2014 20:05:13 +0000 (21:05 +0100)]
Fix SysUI when an app started from the affordances crashes
- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
hideKeyguard to be called. However, neither of these gets called
in this case, so we recover from it by adding a timeout of 5
seconds.
Bug:
18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742
Dan Sandler [Wed, 10 Dec 2014 15:53:59 +0000 (15:53 +0000)]
am
35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
* commit '
3585062760990b8ec3148b266155ae9ec033934d':
BluetoothControllerImpl: track bluetooth better
Dan Sandler [Wed, 10 Dec 2014 15:43:42 +0000 (15:43 +0000)]
Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
Jason Monk [Mon, 8 Dec 2014 21:36:16 +0000 (16:36 -0500)]
BluetoothControllerImpl: track bluetooth better
Match settings behavior better:
- Get connection info from profiles so it is for all devices
(CONNECTION_STATE_CHANGED only updates one)
- Disconnect from all known connections so that 'x' does something
- When device is disconnected without CONNECTION_STATE_CHANGED
then find a new 'last' device that is connected
- Listen to a bunch more broadcasts to make sure info is always
up to date.
Bug:
18210666
Bug:
18638010
Change-Id: Ie003b67bbdd0d452b7472c644d90bca929e5cd29
Geoff Mendal [Wed, 10 Dec 2014 15:00:58 +0000 (15:00 +0000)]
am
fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
fa3f43145ac1af62ed063d3cd7ba1c30a81bb3fd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 15:00:14 +0000 (15:00 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 10 Dec 2014 14:59:21 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9cdc7fac5598329caf1ec9532c197d9a0fe8dbbf
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 14:54:47 +0000 (14:54 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 14:52:52 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfd467c7b204b82119ee78b0bfa34d385786d251
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 14:33:06 +0000 (14:33 +0000)]
am
b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
b7180c450e8364077f37f792160c94941d8839c6':
Import translations. DO NOT MERGE
Jason Monk [Wed, 10 Dec 2014 14:33:00 +0000 (14:33 +0000)]
am
28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev
* commit '
28fffd58a1e9eea2e84c15b124cbfde1c8dbb2c8':
CarrierText clear itself when no mob. data support
Geoff Mendal [Wed, 10 Dec 2014 14:31:09 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I76e8da5cbb1d3c5e39ea80ebdc0f4f9b129febf7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 14:30:39 +0000 (14:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
OSDN Git Service
