OSDN Git Service
Geoff Mendal [Mon, 1 Dec 2014 19:46:31 +0000 (19:46 +0000)]
am
68137588: (-s ours) am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
68137588d1a1924703a2b995b15293515c4ff418':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:24 +0000 (19:46 +0000)]
am
a990faec: (-s ours) Import translations. DO NOT MERGE
* commit '
a990faec871f4ca369e17c7bd36488747e890bc9':
Import translations. DO NOT MERGE
Wally Yau [Mon, 1 Dec 2014 19:46:11 +0000 (19:46 +0000)]
am
5b4e2e02: am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
5b4e2e02744c676f2d282388c0d901494fe8a5b9':
Set stream volume to max when userMasterVolume is set to true.
Elliott Hughes [Mon, 1 Dec 2014 19:45:32 +0000 (19:45 +0000)]
am
7ff0b469: am
07b4a291: am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
Mention ProGuard in the JNI documentation.
Adrian Roos [Mon, 1 Dec 2014 19:33:21 +0000 (19:33 +0000)]
am
17e0a7e7: am
09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev
* commit '
17e0a7e7ac289deacff01c84591dae4009f86415':
Fix projection permission dialog layering
Geoff Mendal [Mon, 1 Dec 2014 19:32:36 +0000 (19:32 +0000)]
am
de3f61f4: (-s ours) am
7028dec6: (-s ours) am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
de3f61f46616ed42c03fc8f171324e011ddbcc5d':
Import translations. DO NOT MERGE
Scott Main [Mon, 1 Dec 2014 19:32:31 +0000 (19:32 +0000)]
am
cd79f9f0: am
4a45a441: am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
cd79f9f0f4a3fb3527023450839313aa67e5e106':
docs:advmgr-updates
smain@google.com [Mon, 1 Dec 2014 19:32:25 +0000 (19:32 +0000)]
am
b8de593e: am
576e248f: am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
b8de593ec2ca04009835960357c59feff28af551':
define height for context images to avoid content jumps on load
Narayan Kamath [Mon, 1 Dec 2014 19:32:12 +0000 (19:32 +0000)]
am
ff45e7df: am
1d184ace: resolved conflicts for merge of
7377998d to lmp-mr1-dev
* commit '
ff45e7df8aae0f55ce719de92102c7d522b62048':
Be increasingly aggressive about fstrim if it isn't being run
Amit Mahajan [Mon, 1 Dec 2014 19:32:06 +0000 (19:32 +0000)]
am
b957d11a: am
4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '
b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
Change to use DATA_ROAMING setting correctly with subId.
Craig Mautner [Mon, 1 Dec 2014 16:49:34 +0000 (16:49 +0000)]
am
b5981aa8: am
ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
* commit '
b5981aa8d18dbd952ff74a75f962d4ec98f38807':
Avoid capture all black screenshot bitmap
Craig Mautner [Mon, 1 Dec 2014 16:44:24 +0000 (16:44 +0000)]
am
ee7c30e1: Merge "Avoid capture all black screenshot bitmap"
* commit '
ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
Avoid capture all black screenshot bitmap
Craig Mautner [Mon, 1 Dec 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Avoid capture all black screenshot bitmap"
Geoff Mendal [Mon, 1 Dec 2014 14:52:53 +0000 (14:52 +0000)]
am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
9cde3e1d82f65eaf73ccf92f14b101e600ef8e18':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:40:31 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 14:36:32 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
Wally Yau [Mon, 1 Dec 2014 13:13:54 +0000 (13:13 +0000)]
am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
da39290460b30e5080769f039d6dff352b3c7808':
Set stream volume to max when userMasterVolume is set to true.
Yohann Roussel [Mon, 1 Dec 2014 10:12:09 +0000 (10:12 +0000)]
am
3e5223fd: am
6829daa4: Merge "Add tests about annotations and enum."
* commit '
3e5223fd02d0f096ca50c964378c717adbb2e3e9':
Add tests about annotations and enum.
Yohann Roussel [Mon, 1 Dec 2014 10:05:45 +0000 (10:05 +0000)]
am
6829daa4: Merge "Add tests about annotations and enum."
* commit '
6829daa44a66333ef869dbcd655eac220c34561b':
Add tests about annotations and enum.
Yohann Roussel [Mon, 1 Dec 2014 09:30:59 +0000 (09:30 +0000)]
Merge "Add tests about annotations and enum."
tingna_sung [Tue, 21 Oct 2014 05:22:16 +0000 (13:22 +0800)]
Avoid capture all black screenshot bitmap
Captured screenshot bitmap is all black one if none of windows is
surface shown.
Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Michael Wright [Mon, 1 Dec 2014 05:27:15 +0000 (05:27 +0000)]
am
fa910081: am
461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
* commit '
fa9100814a9139447e91edf9075a9fe55b044345':
Add keylayout for Logitech RedHawk Gamepad
Craig Mautner [Mon, 1 Dec 2014 05:27:08 +0000 (05:27 +0000)]
am
be342ef0: am
c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
* commit '
be342ef034f05c6864aaa85ab25c009148954552':
[ActivityManager] Ensure provider external access count will be released.
Craig Mautner [Mon, 1 Dec 2014 05:27:00 +0000 (05:27 +0000)]
am
a12ac54c: am
25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '
a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
[ActivityManager] Prevent provider from been created twice.
Craig Mautner [Mon, 1 Dec 2014 05:26:53 +0000 (05:26 +0000)]
am
6151b118: am
94ac906b: Merge "Fix pointer index out of range exception"
* commit '
6151b118b663b0620fee4fb87d9d143c6fd050b8':
Fix pointer index out of range exception
Craig Mautner [Mon, 1 Dec 2014 05:26:47 +0000 (05:26 +0000)]
am
fac55682: am
208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
* commit '
fac55682148e6d9c6b4e24769369e2b76ab018ac':
[ActivityManager] Avoid system server crash due to package removed
Craig Mautner [Mon, 1 Dec 2014 05:26:37 +0000 (05:26 +0000)]
am
11c67c92: am
7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '
11c67c92de3522a50b9994eb83e34c152902ad18':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Mon, 1 Dec 2014 05:15:34 +0000 (21:15 -0800)]
resolved conflicts for merge of
082c0540 to lmp-mr1-dev-plus-aosp
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
Michael Wright [Mon, 1 Dec 2014 04:43:34 +0000 (04:43 +0000)]
am
461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"
* commit '
461eaf79a726f5a754f467d7f3dd163aaa463857':
Add keylayout for Logitech RedHawk Gamepad
Michael Wright [Mon, 1 Dec 2014 04:36:23 +0000 (04:36 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad"
Craig Mautner [Mon, 1 Dec 2014 00:26:11 +0000 (00:26 +0000)]
am
c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released."
* commit '
c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
[ActivityManager] Ensure provider external access count will be released.
Craig Mautner [Mon, 1 Dec 2014 00:22:10 +0000 (00:22 +0000)]
am
25596374: Merge "[ActivityManager] Prevent provider from been created twice."
* commit '
255963742982daf46eb665a2934bd61e7ed95c81':
[ActivityManager] Prevent provider from been created twice.
Craig Mautner [Mon, 1 Dec 2014 00:20:33 +0000 (00:20 +0000)]
Merge "[ActivityManager] Ensure provider external access count will be released."
Craig Mautner [Mon, 1 Dec 2014 00:16:57 +0000 (00:16 +0000)]
am
94ac906b: Merge "Fix pointer index out of range exception"
* commit '
94ac906b103b0f03eca2000815bf306209f33109':
Fix pointer index out of range exception
Craig Mautner [Mon, 1 Dec 2014 00:16:52 +0000 (00:16 +0000)]
am
208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"
* commit '
208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
[ActivityManager] Avoid system server crash due to package removed
Craig Mautner [Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)]
Merge "[ActivityManager] Prevent provider from been created twice."
Craig Mautner [Mon, 1 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Fix pointer index out of range exception"
Craig Mautner [Mon, 1 Dec 2014 00:11:51 +0000 (00:11 +0000)]
Merge "[ActivityManager] Avoid system server crash due to package removed"
Craig Mautner [Sun, 30 Nov 2014 23:59:46 +0000 (23:59 +0000)]
am
7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"
* commit '
7db48ed03623834f7b8b420c83ab7916f6b39a8a':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Sun, 30 Nov 2014 23:59:40 +0000 (23:59 +0000)]
am
728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"
* commit '
728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
Prevent showing immersive confirmation unexpectedly
Craig Mautner [Sun, 30 Nov 2014 23:55:12 +0000 (23:55 +0000)]
Merge "Reset killedByAm flag at attachApplicationLocked"
Craig Mautner [Sun, 30 Nov 2014 23:54:42 +0000 (23:54 +0000)]
Merge "Prevent showing immersive confirmation unexpectedly"
Wally Yau [Fri, 28 Nov 2014 20:40:30 +0000 (12:40 -0800)]
Set stream volume to max when userMasterVolume is set to true.
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.
Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/
18460548
Elliott Hughes [Thu, 27 Nov 2014 19:02:59 +0000 (19:02 +0000)]
am
07b4a291: am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
07b4a291319ec48a272451789ab0fbbf8d55a050':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:57:00 +0000 (18:57 +0000)]
am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
3e2848d249cafbf1cc79b600eab9bce055adcf8e':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:49:58 +0000 (18:49 +0000)]
am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
8fc8856268218fbd286eeb0b2f34eec23cb74f8c':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:41:15 +0000 (18:41 +0000)]
am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
85e21bd534d38f8de12e8229865a863f32c30e7a':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Tue, 25 Nov 2014 19:18:43 +0000 (11:18 -0800)]
Mention ProGuard in the JNI documentation.
(cherry picked from commit
8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)
Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
Elliott Hughes [Thu, 27 Nov 2014 18:11:58 +0000 (18:11 +0000)]
am
3afb9f63: am
2c53d22b: Merge "Mention ProGuard in the JNI documentation."
* commit '
3afb9f6378779e6ee355b0b56c47ad7270e2b832':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:07:00 +0000 (18:07 +0000)]
am
2c53d22b: Merge "Mention ProGuard in the JNI documentation."
* commit '
2c53d22bcc00838125cd70e17915da6ded5d0aca':
Mention ProGuard in the JNI documentation.
Narayan Kamath [Thu, 27 Nov 2014 18:03:15 +0000 (18:03 +0000)]
am
ed2c9c60: am
10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit '
ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
Stop using ErrorStrings for apache.
Elliott Hughes [Thu, 27 Nov 2014 18:01:33 +0000 (18:01 +0000)]
Merge "Mention ProGuard in the JNI documentation."
Narayan Kamath [Thu, 27 Nov 2014 17:58:21 +0000 (17:58 +0000)]
am
10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit '
10a36fb749d05bd90fc8ef3114562cacb631c07c':
Stop using ErrorStrings for apache.
Narayan Kamath [Thu, 27 Nov 2014 17:53:04 +0000 (17:53 +0000)]
Merge "Stop using ErrorStrings for apache."
Narayan Kamath [Thu, 27 Nov 2014 17:20:21 +0000 (17:20 +0000)]
Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.
(congrats webview people, this is now your mess to maintain.)
Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
Narayan Kamath [Thu, 27 Nov 2014 14:10:03 +0000 (14:10 +0000)]
am
bedb1378: am
8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
* commit '
bedb13782a6beb5f15621915a7b68439c6649ced':
Delete general sounding "CharArrayBuffers" class.
Narayan Kamath [Thu, 27 Nov 2014 14:03:57 +0000 (14:03 +0000)]
am
8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
* commit '
8036d2ec739636c1913a417cace97a5027d0270d':
Delete general sounding "CharArrayBuffers" class.
Narayan Kamath [Thu, 27 Nov 2014 13:57:27 +0000 (13:57 +0000)]
Merge "Delete general sounding "CharArrayBuffers" class."
Narayan Kamath [Thu, 27 Nov 2014 13:55:02 +0000 (13:55 +0000)]
am
f0c22b0c: am
14e28134: Merge "Delete unused class from android.net.http."
* commit '
f0c22b0c72c8fbd5ce507419adda0670871a07bf':
Delete unused class from android.net.http.
Olawale Ogunwale [Thu, 27 Nov 2014 13:54:37 +0000 (13:54 +0000)]
am
f5860728: am
87c5f362: Merge "Fix bad exclude region in landscape"
* commit '
f586072861850ade660e11eafa799f96314ce475':
Fix bad exclude region in landscape
Narayan Kamath [Thu, 27 Nov 2014 12:58:52 +0000 (12:58 +0000)]
Delete general sounding "CharArrayBuffers" class.
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.
Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
Adrian Roos [Thu, 27 Nov 2014 13:06:00 +0000 (13:06 +0000)]
am
09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev
* commit '
09eeab7cbffae64add657f1a1e7ab6c7f20b6d9b':
Fix projection permission dialog layering
Narayan Kamath [Thu, 27 Nov 2014 13:03:34 +0000 (13:03 +0000)]
am
14e28134: Merge "Delete unused class from android.net.http."
* commit '
14e28134c445435d71ed754e6be5867655d1dda3':
Delete unused class from android.net.http.
Adrian Roos [Thu, 27 Nov 2014 13:00:59 +0000 (13:00 +0000)]
Merge "Fix projection permission dialog layering" into lmp-mr1-dev
Narayan Kamath [Thu, 27 Nov 2014 12:58:32 +0000 (12:58 +0000)]
Merge "Delete unused class from android.net.http."
Narayan Kamath [Thu, 27 Nov 2014 12:52:48 +0000 (12:52 +0000)]
Delete unused class from android.net.http.
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.
Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
Craig Mautner [Thu, 27 Nov 2014 12:01:33 +0000 (12:01 +0000)]
am
980ce4ba: am
200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '
980ce4bad08f65e559c39e86e799389c6615297e':
ANR caused by incorrect cleanup in BroadcastQueue.
Jeff Sharkey [Thu, 27 Nov 2014 12:01:18 +0000 (12:01 +0000)]
am
d76737a7: am
b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app""
* commit '
d76737a7325bdcd5010f26fd1626628f07070bb9':
APK still has privileged flag after being moved from "/system/priv-app"
Ignacio Solla [Thu, 27 Nov 2014 12:01:12 +0000 (12:01 +0000)]
am
59565277: (-s ours) am
c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK."
* commit '
59565277d9fc1d0f21d55a528b2a6e395f051e5d':
[WebView] Allow the WebView to be compiled against the system SDK.
Geoff Mendal [Thu, 27 Nov 2014 10:18:58 +0000 (10:18 +0000)]
am
7028dec6: (-s ours) am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
7028dec6ca10cdc63966dad01e59cdbabd6a0a1d':
Import translations. DO NOT MERGE
Scott Main [Thu, 27 Nov 2014 10:18:52 +0000 (10:18 +0000)]
am
4a45a441: am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
4a45a44152c965363a4689befdcbd57177e48831':
docs:advmgr-updates
smain@google.com [Thu, 27 Nov 2014 10:18:47 +0000 (10:18 +0000)]
am
576e248f: am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
576e248f3ca32576ed3c37dadf6a4f90dc6b4f59':
define height for context images to avoid content jumps on load
Narayan Kamath [Thu, 27 Nov 2014 10:09:46 +0000 (10:09 +0000)]
am
1d184ace: resolved conflicts for merge of
7377998d to lmp-mr1-dev
* commit '
1d184acefa7105592134edebf7de4d77843d5791':
Be increasingly aggressive about fstrim if it isn't being run
Geoff Mendal [Thu, 27 Nov 2014 10:09:40 +0000 (10:09 +0000)]
am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
022f4277c468176d43d4ed1cc12898e33ed1a502':
Import translations. DO NOT MERGE
Scott Main [Thu, 27 Nov 2014 10:08:51 +0000 (10:08 +0000)]
am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
docs:advmgr-updates
smain@google.com [Thu, 27 Nov 2014 10:08:45 +0000 (10:08 +0000)]
am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
277fb8fdaeb546119bc31269425edc72b75e87dd':
define height for context images to avoid content jumps on load
Narayan Kamath [Thu, 27 Nov 2014 09:57:35 +0000 (09:57 +0000)]
resolved conflicts for merge of
7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
riddle_hsu [Sat, 15 Nov 2014 10:25:34 +0000 (18:25 +0800)]
[ActivityManager] Prevent provider from been created twice.
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.
Solution:
Don't schedule install provider if the provider record
already exist and will be published later.
Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
Amit Mahajan [Thu, 27 Nov 2014 03:11:57 +0000 (03:11 +0000)]
am
4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '
4ebd1e42a78dcb0ee219548b89f3733320bbc029':
Change to use DATA_ROAMING setting correctly with subId.
Amit Mahajan [Thu, 27 Nov 2014 03:05:45 +0000 (03:05 +0000)]
Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
Eino-Ville Talvala [Thu, 27 Nov 2014 00:33:09 +0000 (00:33 +0000)]
am
ec26692d: am
9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '
ec26692d1f65cf04963d8412e3e3bdd0d42796ea':
CameraManager: Separate service listener into a singleton
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
Fix pointer index out of range exception
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.
Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Eino-Ville Talvala [Thu, 27 Nov 2014 00:27:36 +0000 (00:27 +0000)]
am
9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '
9b35b801fb90e31c1dff5535715e505f3a1e26fb':
CameraManager: Separate service listener into a singleton
Eino-Ville Talvala [Thu, 27 Nov 2014 00:23:40 +0000 (00:23 +0000)]
Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
Eric Laurent [Thu, 27 Nov 2014 00:01:23 +0000 (00:01 +0000)]
am
981951e4: am
563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '
981951e4f9bae85dcf6f717023596c08dc245ee7':
AudioRecord JNI: pass attributes to native AudioRecord.
Eric Laurent [Wed, 26 Nov 2014 23:56:43 +0000 (23:56 +0000)]
am
563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '
563e61f5d06aca653894cecc2977bac70b08227c':
AudioRecord JNI: pass attributes to native AudioRecord.
Jeff Davidson [Wed, 26 Nov 2014 23:52:56 +0000 (23:52 +0000)]
am
c452bac6: am
3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit '
c452bac6fc100bf30d4ddde5b4e008dd862750e5':
Add string for "Connected via Wi-Fi assistant".
Eric Laurent [Wed, 26 Nov 2014 23:52:06 +0000 (23:52 +0000)]
Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:46:44 +0000 (23:46 +0000)]
am
3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit '
3caf0f8e440fcc9947b8b153464ccdbc62640c97':
Add string for "Connected via Wi-Fi assistant".
Mathieu Meisser [Wed, 26 Nov 2014 23:44:42 +0000 (00:44 +0100)]
Add keylayout for Logitech RedHawk Gamepad
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
Jeff Davidson [Wed, 26 Nov 2014 23:42:52 +0000 (23:42 +0000)]
Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:27:02 +0000 (15:27 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Olawale Ogunwale [Wed, 26 Nov 2014 23:20:30 +0000 (23:20 +0000)]
am
87c5f362: Merge "Fix bad exclude region in landscape"
* commit '
87c5f3621037eda3c4d141e5681d4acbbaa13944':
Fix bad exclude region in landscape
Olawale Ogunwale [Wed, 26 Nov 2014 23:13:59 +0000 (23:13 +0000)]
Merge "Fix bad exclude region in landscape"
Kazuki Nakayama [Thu, 29 May 2014 07:05:34 +0000 (16:05 +0900)]
Reset killedByAm flag at attachApplicationLocked
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.
Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
Eino-Ville Talvala [Wed, 22 Oct 2014 21:39:31 +0000 (14:39 -0700)]
CameraManager: Separate service listener into a singleton
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.
This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.
Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.
Bug:
18077200
Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
Craig Mautner [Wed, 26 Nov 2014 21:47:35 +0000 (21:47 +0000)]
am
200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '
200496b5714675a31376e78977713fcbad775fb5':
ANR caused by incorrect cleanup in BroadcastQueue.
Craig Mautner [Wed, 26 Nov 2014 21:43:59 +0000 (21:43 +0000)]
Merge "ANR caused by incorrect cleanup in BroadcastQueue."
Jinsuk Kim [Wed, 26 Nov 2014 21:39:08 +0000 (21:39 +0000)]
am
c69c8dc1: am
bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit '
c69c8dc15972179728932f91dde483e9d61f34a9':
Do not perform forceVolumeControlStream in master volume mode
Jinsuk Kim [Wed, 26 Nov 2014 21:33:23 +0000 (21:33 +0000)]
am
bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit '
bc3226e21dfe881bf1ccae62e10b660d97b2b232':
Do not perform forceVolumeControlStream in master volume mode
OSDN Git Service
