OSDN Git Service
Cheryl Potter [Tue, 8 Sep 2015 22:19:44 +0000 (22:19 +0000)]
am
27a85cca: am
fb53f115: am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
27a85cca7c001ec47749feb60461081f14b2dfe3':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:13:22 +0000 (22:13 +0000)]
am
fb53f115: am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
fb53f11515554f618d5888c8137119bcc4f316cb':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:04:32 +0000 (22:04 +0000)]
am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
d35c7940112fa7edae03a1b43670157787a69d3d':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:55:46 +0000 (21:55 +0000)]
am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]
am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
xin He [Tue, 8 Sep 2015 21:31:35 +0000 (21:31 +0000)]
am
fb4e0323: am
2248874b: am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
fb4e0323a248c720170e010ea97299bf3f7415d1':
Introduce config_wifi_revert_country_code_on_cellular_loss
xin He [Tue, 8 Sep 2015 21:20:02 +0000 (21:20 +0000)]
am
2248874b: am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
2248874b8b7503b484556a1b46fdb23379fbc107':
Introduce config_wifi_revert_country_code_on_cellular_loss
xin He [Tue, 8 Sep 2015 21:09:13 +0000 (21:09 +0000)]
am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
ee1babecd204def48feb1fcf648dbed5cd760697':
Introduce config_wifi_revert_country_code_on_cellular_loss
Jorim Jaggi [Tue, 8 Sep 2015 21:08:40 +0000 (21:08 +0000)]
am
dee90112: am
10352f7a: am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
dee90112ce6d47a5740fd60449f948c37a8956e4':
Do not expand notifications with expand gesture when disallowed
xin He [Tue, 8 Sep 2015 21:01:49 +0000 (21:01 +0000)]
Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
Jorim Jaggi [Tue, 8 Sep 2015 20:58:56 +0000 (20:58 +0000)]
am
10352f7a: am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
10352f7a48433b5b76cd5d35a5eec6c3df203a1f':
Do not expand notifications with expand gesture when disallowed
Jorim Jaggi [Tue, 8 Sep 2015 20:50:53 +0000 (20:50 +0000)]
am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
5e8e1c63774da8c013fad18a63eac691cdc9646f':
Do not expand notifications with expand gesture when disallowed
Jorim Jaggi [Fri, 4 Sep 2015 18:51:26 +0000 (11:51 -0700)]
Do not expand notifications with expand gesture when disallowed
Bug:
23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
Nick Armstrong-Crews [Tue, 8 Sep 2015 05:28:51 +0000 (05:28 +0000)]
am
740cf71c: am
56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '
740cf71c9978e5dcb0a68b6558531a52dc26d44f':
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Nick Armstrong-Crews [Tue, 8 Sep 2015 05:23:49 +0000 (05:23 +0000)]
am
56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '
56ecfcce6c88fc80cf509effcebb124bbe0c79f8':
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Nick Armstrong-Crews [Tue, 8 Sep 2015 04:46:50 +0000 (21:46 -0700)]
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).
BUG: b/
23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
Nick Armstrong-Crews [Tue, 8 Sep 2015 04:43:38 +0000 (04:43 +0000)]
am
36afc2b7: am
9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '
36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
Nick Armstrong-Crews [Tue, 8 Sep 2015 04:35:36 +0000 (04:35 +0000)]
am
9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '
9b8f82a3a073891965a962251f9e613ba8cc90bb':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
Nick Armstrong-Crews [Tue, 8 Sep 2015 04:28:07 +0000 (04:28 +0000)]
Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
Nick Armstrong-Crews [Tue, 8 Sep 2015 04:25:01 +0000 (04:25 +0000)]
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
This reverts commit
677adf1e66ba83b8fb2c849c181303b35bd489bc.
Hiding new keycode to prevent change to public API before resubmitting.
Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
Geoff Mendal [Mon, 7 Sep 2015 15:51:05 +0000 (15:51 +0000)]
am
953c6a4a: (-s ours) am
024fb4d4: (-s ours) am
9f3e169c: (-s ours) Import translations. DO NOT MERGE
* commit '
953c6a4a53715bd7e88dad78814110709bf7bf7f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:42:40 +0000 (15:42 +0000)]
am
024fb4d4: (-s ours) am
9f3e169c: (-s ours) Import translations. DO NOT MERGE
* commit '
024fb4d4b803c35b3aad784f6a2d877a7118c3b2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:38:18 +0000 (15:38 +0000)]
am
9f3e169c: (-s ours) Import translations. DO NOT MERGE
* commit '
9f3e169c3a6277187fe00abc2eaa08d5872160ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:31:05 +0000 (08:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
Cheryl Potter [Fri, 4 Sep 2015 23:08:53 +0000 (23:08 +0000)]
am
179594bb: am
dd9c75f3: am
24a6be46: am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
179594bb471d401fca5fdf372617ca9bbcf97252':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 23:08:47 +0000 (23:08 +0000)]
am
d9c1c83f: am
18b68b26: am
8f2a5b25: am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
d9c1c83f45eb1718a6e7ba3fb26790c256c7f344':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 23:00:43 +0000 (23:00 +0000)]
am
dd9c75f3: am
24a6be46: am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
dd9c75f33181664f7dac7c3d5eb0cc6eae0d6f7b':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 23:00:35 +0000 (23:00 +0000)]
am
18b68b26: am
8f2a5b25: am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
18b68b2650422dd926c11618d5cf1bec1756d9c2':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:50:51 +0000 (22:50 +0000)]
am
24a6be46: am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
24a6be463e5628416ad234a3e2e33f1f4cc5b287':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:50:47 +0000 (22:50 +0000)]
am
8f2a5b25: am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
8f2a5b257603971405ce94a57d26dc26233b20db':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:45:57 +0000 (22:45 +0000)]
am
36866dc7: am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
36866dc7347ba37ced74af6f8a6298c62282dacb':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:45:53 +0000 (22:45 +0000)]
am
1edd4ebc: am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
1edd4ebce50a653f3d1454114f5cd73edcace903':
Minor fix on Auto Desktop Head Unit doc.
Cheryl Potter [Fri, 4 Sep 2015 22:35:43 +0000 (22:35 +0000)]
am
4afcda74: am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:35:36 +0000 (22:35 +0000)]
am
a8b9a2b7: am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
a8b9a2b7aeab97f71ff876319d807d9f151c6065':
Minor fix on Auto Desktop Head Unit doc.
Robert Greenwalt [Fri, 4 Sep 2015 22:27:45 +0000 (22:27 +0000)]
am
597c55b5: am
e686d9b3: am
8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '
597c55b5790f2bbc86cd2333a71a934bf351fa3c':
Cut down some logs.
Cheryl Potter [Fri, 4 Sep 2015 22:24:55 +0000 (22:24 +0000)]
am
79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '
79ad6310ea3ca5931013cf746babf55cf391cc8f':
docs: changed references to Google+ sign-in to Google sign-in
Renato Mangini [Fri, 4 Sep 2015 22:24:48 +0000 (22:24 +0000)]
am
81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '
81e0dff0da637f3580ac81e86950b23e9a55bbdc':
Minor fix on Auto Desktop Head Unit doc.
Robert Greenwalt [Fri, 4 Sep 2015 22:17:35 +0000 (22:17 +0000)]
am
e686d9b3: am
8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '
e686d9b3aa547b89b85b3330d452d06b52196f8c':
Cut down some logs.
Cheryl Potter [Fri, 4 Sep 2015 22:14:25 +0000 (22:14 +0000)]
Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
Vinit Deshpande [Fri, 4 Sep 2015 22:01:23 +0000 (15:01 -0700)]
Introduce config_wifi_revert_country_code_on_cellular_loss
This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC
bug:
21795172
Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
Robert Greenwalt [Fri, 4 Sep 2015 22:06:00 +0000 (22:06 +0000)]
am
8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '
8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
Cut down some logs.
Dan Willemsen [Fri, 4 Sep 2015 22:00:26 +0000 (22:00 +0000)]
am
03c26b27: am
596fd38a: Merge "Whitelist windows module"
* commit '
03c26b274aed35c0a580b309567264d00cb643f2':
Whitelist windows module
Robert Greenwalt [Fri, 4 Sep 2015 21:51:50 +0000 (21:51 +0000)]
Merge "Cut down some logs." into mnc-dr-dev
Dan Willemsen [Fri, 4 Sep 2015 21:48:35 +0000 (21:48 +0000)]
am
596fd38a: Merge "Whitelist windows module"
* commit '
596fd38af207727d508a63fca39506c90ba29c44':
Whitelist windows module
Dan Willemsen [Fri, 4 Sep 2015 21:36:50 +0000 (21:36 +0000)]
Merge "Whitelist windows module"
Joe LaPenna [Fri, 4 Sep 2015 21:31:44 +0000 (21:31 +0000)]
am
551de25f: am
ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev
* commit '
551de25fd289c69f2c1ac9f486c88cb9b93861ef':
Do not wtf when the systemui is not present.
Dan Willemsen [Fri, 4 Sep 2015 21:21:26 +0000 (14:21 -0700)]
Whitelist windows module
Bug:
23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c
Joe LaPenna [Fri, 4 Sep 2015 21:11:37 +0000 (21:11 +0000)]
am
ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev
* commit '
ebff4c1d90d8f1465a3376130fe65a9c045b683d':
Do not wtf when the systemui is not present.
Joe LaPenna [Fri, 4 Sep 2015 21:01:12 +0000 (21:01 +0000)]
Merge "Do not wtf when the systemui is not present." into cw-e-dev
Joe LaPenna [Fri, 4 Sep 2015 19:52:42 +0000 (12:52 -0700)]
Do not wtf when the systemui is not present.
Not all devices, like wearables actually have a system ui.
BUG:
23822226
Change-Id: Ibc2d6c3b8db1de668b9cbced3efcec5a7a39f20b
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:22:54 +0000 (18:22 +0000)]
am
43c4459d: am
6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '
43c4459d995ce7a723d92945a7e4ccb81d48e224':
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:11:44 +0000 (18:11 +0000)]
am
6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '
6f0ba402242cb8fd374f5b188e53669ec0cf34c7':
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:04:12 +0000 (18:04 +0000)]
Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
Nick Armstrong-Crews [Thu, 27 Aug 2015 20:53:25 +0000 (13:53 -0700)]
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).
BUG: b/
23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:41:22 +0000 (16:41 +0000)]
am
578151c6: am
fb611846: am
566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
* commit '
578151c673bf59e4bccd2237032f720705b4dff2':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
Sungmin Choi [Fri, 4 Sep 2015 16:30:25 +0000 (16:30 +0000)]
am
1dcccdf6: am
46b7e9e9: am
4c97f3a4: Do not show roaming icon for some operators of Chile
* commit '
1dcccdf615dea92609891c8de42e08b8fa927617':
Do not show roaming icon for some operators of Chile
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:28:17 +0000 (16:28 +0000)]
am
fb611846: am
566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
* commit '
fb611846f6ca62ea248eac0b35a8d6d1fe5f5116':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
Sungmin Choi [Fri, 4 Sep 2015 16:22:00 +0000 (16:22 +0000)]
am
46b7e9e9: am
4c97f3a4: Do not show roaming icon for some operators of Chile
* commit '
46b7e9e95dc1510e3720361b396de4be50ad59a5':
Do not show roaming icon for some operators of Chile
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:20:11 +0000 (16:20 +0000)]
am
566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
* commit '
566886f7973b86196174e925f16d26975c16a09b':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:09:02 +0000 (16:09 +0000)]
Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
Sungmin Choi [Fri, 4 Sep 2015 16:08:04 +0000 (16:08 +0000)]
am
4c97f3a4: Do not show roaming icon for some operators of Chile
* commit '
4c97f3a45a3ba345d630e282c07c5126128514eb':
Do not show roaming icon for some operators of Chile
Alan Viverette [Fri, 4 Sep 2015 12:40:02 +0000 (12:40 +0000)]
am
bc635a25: am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
bc635a2574430f345aaa042e003935f315788304':
Update mFillPaint color on GradientDrawable inflation
Alan Viverette [Fri, 4 Sep 2015 12:31:46 +0000 (12:31 +0000)]
am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
3d6325460ec19c89c40d2083e8ca89fe53d5575b':
Update mFillPaint color on GradientDrawable inflation
Alan Viverette [Fri, 4 Sep 2015 11:51:02 +0000 (11:51 +0000)]
Merge "Update mFillPaint color on GradientDrawable inflation"
Snild Dolkow [Fri, 4 Sep 2015 08:08:05 +0000 (10:08 +0200)]
Update mFillPaint color on GradientDrawable inflation
When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.
In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.
This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.
Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79
Sungmin Choi [Thu, 3 Sep 2015 20:20:46 +0000 (13:20 -0700)]
Do not show roaming icon for some operators of Chile
Bug:
23775352
Change-Id: Ie86c628e4acb8fe4b4d24feec98f5a9227c9346c
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:47:52 +0000 (02:47 +0000)]
am
10191dd9: am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
10191dd9d20f589fd6f7868a350c104372a57687':
Remove unnecessary finally blocks for tracing.
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:34:58 +0000 (02:34 +0000)]
am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
53f1a815b4401f10cd833217143da44ab0408dcc':
Remove unnecessary finally blocks for tracing.
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:23:31 +0000 (02:23 +0000)]
Merge "Remove unnecessary finally blocks for tracing."
Andre Eisenbach [Fri, 4 Sep 2015 02:22:11 +0000 (02:22 +0000)]
am
f1ed1fdb: am
1b03cd8e: am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
f1ed1fdb4578c205ebe2d1af6f49512219506254':
Bluetooth: Fix profile auto-connect logic
Dan Stoza [Fri, 4 Sep 2015 02:21:41 +0000 (02:21 +0000)]
am
4a90942e: am
f615872c: am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
4a90942ea75039f916d8371111fdc41a80039b98':
SurfaceControl: Add colorTransform to DisplayInfo
Amit Mahajan [Fri, 4 Sep 2015 02:21:31 +0000 (02:21 +0000)]
am
ff751bed: am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
ff751bed7ce737d95db2edc79ffe2f34c0259a27':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Fri, 4 Sep 2015 02:21:21 +0000 (02:21 +0000)]
am
80770c09: am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
80770c099144b65e9c7768bbdb56608eebf03b01':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Robert Greenwalt [Thu, 3 Sep 2015 23:41:45 +0000 (16:41 -0700)]
Cut down some logs.
bug:
23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a
Andre Eisenbach [Fri, 4 Sep 2015 00:28:09 +0000 (00:28 +0000)]
am
1b03cd8e: am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
1b03cd8e1b79280e892f81709ced42b990a8905d':
Bluetooth: Fix profile auto-connect logic
Andre Eisenbach [Fri, 4 Sep 2015 00:12:33 +0000 (00:12 +0000)]
am
1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
* commit '
1d5e2e291d4c3fbcde1425af74644a24c94e1577':
Bluetooth: Fix profile auto-connect logic
Andre Eisenbach [Fri, 4 Sep 2015 00:02:57 +0000 (00:02 +0000)]
Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
Andre Eisenbach [Thu, 3 Sep 2015 22:20:09 +0000 (15:20 -0700)]
Bluetooth: Fix profile auto-connect logic
The fix in commit
05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.
This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.
Bug:
22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
Dan Stoza [Thu, 3 Sep 2015 22:13:31 +0000 (22:13 +0000)]
am
f615872c: am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
f615872cb49062de9113c7c5be31d3b1d1b423af':
SurfaceControl: Add colorTransform to DisplayInfo
Dan Stoza [Thu, 3 Sep 2015 22:03:08 +0000 (22:03 +0000)]
am
0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
0b887e579b766012c09626e7089a3fade5415ee6':
SurfaceControl: Add colorTransform to DisplayInfo
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
Amit Mahajan [Thu, 3 Sep 2015 21:50:00 +0000 (21:50 +0000)]
am
2f142ab0: am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
2f142ab0779c9e36c6f733d7e2e0be083f7172ac':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:39:52 +0000 (21:39 +0000)]
am
8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev
* commit '
8a670f1da434c4720b08dbb62c635316e593b9b3':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Amit Mahajan [Thu, 3 Sep 2015 21:24:46 +0000 (21:24 +0000)]
Merge changes from topic 'TDSCDMA support' into mnc-dr-dev
* changes:
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
Sharvil Nanavati [Thu, 3 Sep 2015 21:12:33 +0000 (21:12 +0000)]
am
16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
* commit '
16db4101829c7beee42a09fcaf87fa4e31bc1d5a':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
Sharvil Nanavati [Thu, 3 Sep 2015 21:02:43 +0000 (21:02 +0000)]
Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev
Dan Stoza [Mon, 31 Aug 2015 19:01:48 +0000 (12:01 -0700)]
SurfaceControl: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.
Bug:
20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
Adrian Roos [Thu, 3 Sep 2015 20:07:30 +0000 (20:07 +0000)]
am
6bd2f87e: am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 20:07:25 +0000 (20:07 +0000)]
am
95179ad4: am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95179ad4be0377dd9fd35818145f705bcded0d28':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:58:08 +0000 (19:58 +0000)]
am
bd2ad550: am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
bd2ad550c5a7c7b7efbe3510f212322fb173b06c':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:57:58 +0000 (19:57 +0000)]
am
54ceea19: am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:46:45 +0000 (19:46 +0000)]
am
34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '
34411e8fecab310a0402bd77e8fe5a5a488a783a':
Don't disable fingerprint when entering wrong credential
Adrian Roos [Thu, 3 Sep 2015 19:46:41 +0000 (19:46 +0000)]
am
95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '
95200e6f4eb34818ac0b652167cffacfcfb4fdff':
Poke fingerprint timeout when vold password is correct
Adrian Roos [Thu, 3 Sep 2015 19:42:39 +0000 (19:42 +0000)]
Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
Adrian Roos [Thu, 3 Sep 2015 19:41:22 +0000 (19:41 +0000)]
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
Adrian Roos [Wed, 2 Sep 2015 20:23:30 +0000 (13:23 -0700)]
Don't disable fingerprint when entering wrong credential
Bug:
23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
Adrian Roos [Wed, 2 Sep 2015 20:26:25 +0000 (13:26 -0700)]
Poke fingerprint timeout when vold password is correct
Bug:
23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
Adrian Roos [Thu, 3 Sep 2015 19:29:42 +0000 (19:29 +0000)]
am
4eb81345: am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
4eb81345da21efc2b9731cb1969704081064690c':
Show face unlock even when fingerprint is running
Adrian Roos [Thu, 3 Sep 2015 19:17:36 +0000 (19:17 +0000)]
am
b90f1de2: am
1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '
b90f1de216ec8be27eebd17b5f3c6a87ee084e75':
Show face unlock even when fingerprint is running