OSDN Git Service
Justin Harrison [Thu, 14 Jan 2016 08:43:45 +0000 (08:43 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am:
e41a6c8b19 am:
2363da89a4
am:
5cb336586e -s ours
* commit '
5cb336586e55e6add5aec1d87ee8848657d9051d':
Fix race condition when setting default ringtones
Amit Mahajan [Thu, 14 Jan 2016 08:09:30 +0000 (08:09 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am:
c6c9b2aa66 am:
cd097ff856
am:
2bb7707e00 -s ours
* commit '
2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 08:07:45 +0000 (08:07 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am:
658fdf8426 am:
2b260b0006
am:
fa86813a56 -s ours
* commit '
fa86813a56cf631b4609387e8ef5ed9e82b47eac':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Daichi Hirono [Thu, 14 Jan 2016 07:46:43 +0000 (07:46 +0000)]
Merge "Add a test for createDocument and getPartialObject."
Justin Harrison [Thu, 14 Jan 2016 06:48:37 +0000 (06:48 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am:
e41a6c8b19
am:
2363da89a4
* commit '
2363da89a431d8809c49e4bb9568f63887e6e33e':
Fix race condition when setting default ringtones
Justin Harrison [Thu, 14 Jan 2016 06:44:21 +0000 (06:44 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
am:
e41a6c8b19
* commit '
e41a6c8b19482a05a98e77d13281f7f14056f119':
Fix race condition when setting default ringtones
Justin Harrison [Thu, 14 Jan 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:38:27 +0000 (06:38 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am:
c6c9b2aa66
am:
cd097ff856
* commit '
cd097ff856b800e3d6b991adfe2316007ddb9957':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 06:34:46 +0000 (06:34 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am:
658fdf8426
am:
2b260b0006
* commit '
2b260b0006403e6be39015c12e422f9782ce6877':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Amit Mahajan [Thu, 14 Jan 2016 06:33:00 +0000 (06:33 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
am:
c6c9b2aa66
* commit '
c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 06:30:15 +0000 (06:30 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
am:
658fdf8426
* commit '
658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Amit Mahajan [Thu, 14 Jan 2016 06:28:47 +0000 (06:28 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:26:26 +0000 (06:26 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
Chenjie Luo [Thu, 14 Jan 2016 06:13:43 +0000 (06:13 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am:
4a577bff96 am:
d5cea64d8d am:
7034a6e2d0
am:
af8c1b8f94
* commit '
af8c1b8f943f2c616c75da83b44063ae3a5f556f':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Daichi Hirono [Mon, 11 Jan 2016 08:14:41 +0000 (17:14 +0900)]
Add a test for createDocument and getPartialObject.
BUG=
26482337
Change-Id: Ifda5055b422c3960f7c3c5275a1697f96e36bd06
Daichi Hirono [Thu, 14 Jan 2016 03:59:12 +0000 (03:59 +0000)]
Merge "Check isDestroyed after finishing async HandleRootsChangedTask."
Daichi Hirono [Thu, 14 Jan 2016 03:45:49 +0000 (12:45 +0900)]
Check isDestroyed after finishing async HandleRootsChangedTask.
HandleRootsChangedTask will be finished after the Activity is destroyed,
though we no longer to be able to change the directory at that time.
BUG=
26454277
Change-Id: Ia414134c80d900ef2e6c382fdd9209a154d940af
Adam Lesinski [Thu, 14 Jan 2016 02:51:02 +0000 (02:51 +0000)]
Merge "AAPT2: Variety of small fixes to get the build working"
Adam Lesinski [Mon, 11 Jan 2016 21:10:24 +0000 (13:10 -0800)]
AAPT2: Variety of small fixes to get the build working
- Add option to rename package in AndroidManifest.xml
- Support default versionName and versionCode
- Accept True and False as valid booleans
Change-Id: I400e350b9dcd0fd1c197d1929144299c7823617d
Jiaquan He [Wed, 13 Jan 2016 23:46:52 +0000 (15:46 -0800)]
Add support for shortcuts with the shift key.
Now shortcuts with the shift key can be defined in
frameworks/base/packages/SettingsProvider/res/xml/bookmarks.xml.
Sample:
<bookmark
package="package"
class="package.Class"
shift="true"
shortcut="z" />
Bug
26540880
Change-Id: Ib6d6ea59124226d4e4eb8ec9972059f2d71bd77e
(cherry picked from commit
e7319ecbbe865db8884914ceb10f526f4e160a64)
Chenjie Luo [Thu, 14 Jan 2016 02:34:53 +0000 (02:34 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am:
4a577bff96 am:
d5cea64d8d
am:
7034a6e2d0
* commit '
7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Chenjie Luo [Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am:
4a577bff96
am:
d5cea64d8d
* commit '
d5cea64d8d63e9ffb61af1e669962de08ea513cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Daichi Hirono [Thu, 14 Jan 2016 02:28:45 +0000 (02:28 +0000)]
Merge "Change offset and size arguments of MtpDevice#getPartialObject to Java long."
Vinit Deshpande [Thu, 14 Jan 2016 00:58:30 +0000 (16:58 -0800)]
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Bug:
24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
Chenjie Luo [Thu, 14 Jan 2016 02:24:48 +0000 (02:24 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am:
4a577bff96
* commit '
4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
Dongwon Kang [Thu, 14 Jan 2016 02:16:23 +0000 (02:16 +0000)]
Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED"
Dongwon Kang [Thu, 14 Jan 2016 02:11:10 +0000 (18:11 -0800)]
Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED
This addresses comments left in If506a533c5c7b567e770217a9430bf68b539677a
Change-Id: I6f952db6a8fa246d974bab556be3e21fe1b7f3da
Amit Mahajan [Wed, 13 Jan 2016 02:25:33 +0000 (18:25 -0800)]
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug:
24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
Doris Liu [Thu, 14 Jan 2016 01:30:02 +0000 (01:30 +0000)]
Merge "Properly handle the negative scaling factor of canvas in VectorDrawable"
Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug:
25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
Doris Liu [Thu, 14 Jan 2016 01:23:33 +0000 (17:23 -0800)]
Properly handle the negative scaling factor of canvas in VectorDrawable
Bug:
26489687
Change-Id: I91cce34759fbbac206cd59f4636fd92194396c87
Jorim Jaggi [Thu, 14 Jan 2016 01:08:52 +0000 (01:08 +0000)]
Merge changes I55d96ec3,I0ebc4639
* changes:
Reenable task preloading in recents
When creating docked stack, use SnapAlgorithm
Adam Lesinski [Thu, 14 Jan 2016 01:05:24 +0000 (01:05 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am:
d2e215978b am:
a5c7106017
am:
6a8c328d73
* commit '
6a8c328d7386d19f4590dfbfc71338b1ec208fb7':
UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 14 Jan 2016 00:59:58 +0000 (00:59 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am:
d2e215978b
am:
a5c7106017
* commit '
a5c71060174c5357c75592998fb095e768eca8bd':
UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 14 Jan 2016 00:54:10 +0000 (00:54 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am:
d2e215978b
* commit '
d2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
UsageStats: Use new settings key idle_duration2 for app idle
Pavel Zhamaitsiak [Thu, 14 Jan 2016 00:49:09 +0000 (00:49 +0000)]
Merge "Add ITelephonyDebug.aidl" into mm-wireless-dev
am:
4a4345b681
* commit '
4a4345b681f430bc76bed964eb3d4d569539130e':
Add ITelephonyDebug.aidl
Adam Lesinski [Thu, 14 Jan 2016 00:45:31 +0000 (00:45 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
Daichi Hirono [Tue, 12 Jan 2016 06:46:41 +0000 (15:46 +0900)]
Change offset and size arguments of MtpDevice#getPartialObject to Java
long.
To represents full range of 32-bit unsigned integer, we should use
jlong instead of jint.
BUG=
26284424
Change-Id: Id3fa9e3daa778c204ab8e38f821d454c709c317a
Nancy Zheng [Thu, 14 Jan 2016 00:34:11 +0000 (00:34 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1 am:
74dfcf90f1 am:
f474056e99 am:
f4c56a21a3
am:
b05f242bc8
* commit '
b05f242bc809196a58b1142665a336fc23dc7f9c':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Thu, 14 Jan 2016 00:23:20 +0000 (00:23 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1 am:
74dfcf90f1 am:
f474056e99
am:
f4c56a21a3
* commit '
f4c56a21a389e70b472e4e7e586c7cf59a444f8e':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Jorim Jaggi [Thu, 7 Jan 2016 13:42:28 +0000 (14:42 +0100)]
Reenable task preloading in recents
Make sure to call the task stack changed listener only when
app visibilities changed. This fixes the problem of too many
callbacks when just focusing another activity.
Bug:
26420341
Change-Id: I55d96ec367f7461be1f3e35bc0d12ae4b050ece0
Jorim Jaggi [Wed, 6 Jan 2016 16:18:44 +0000 (17:18 +0100)]
When creating docked stack, use SnapAlgorithm
To make sure the bounds snapped to a snap position are
set from the very beginning.
Change-Id: I0ebc463926dd17e0deeefc211b097f28a6456b96
Selim Cinek [Thu, 14 Jan 2016 00:12:20 +0000 (00:12 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am:
d23f1eb0cd am:
804ff964af
am:
a8a4d29aec -s ours
* commit '
a8a4d29aecd1eca223245d1db1231707992c9341':
Fixed a crash with the heads up manager
Nancy Zheng [Thu, 14 Jan 2016 00:12:14 +0000 (00:12 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1 am:
74dfcf90f1
am:
f474056e99
* commit '
f474056e99de892b731155989ee0d9dae1d3eea7':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Wed, 13 Jan 2016 23:59:42 +0000 (23:59 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
am:
74dfcf90f1
* commit '
74dfcf90f18d8d0e1128707a5986c4fa94d70350':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Makoto Onuki [Wed, 13 Jan 2016 23:51:35 +0000 (23:51 +0000)]
Merge "API for blocked number provider"
Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Bug:
26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Ian Pedowitz [Wed, 13 Jan 2016 23:21:49 +0000 (23:21 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Ian Pedowitz [Wed, 13 Jan 2016 23:21:05 +0000 (23:21 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am:
624d43b66f am:
0cd5e9f475
am:
105108209f
* commit '
105108209fc35b5029e5a728c09f6eaf91b8a940':
Revert "Avoid drawable invalidation during draw()"
Ian Pedowitz [Wed, 13 Jan 2016 23:19:39 +0000 (23:19 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am:
624d43b66f am:
0cd5e9f475
am:
105108209f
* commit '
105108209fc35b5029e5a728c09f6eaf91b8a940':
Revert "Avoid drawable invalidation during draw()"
Robert Greenwalt [Wed, 13 Jan 2016 23:18:06 +0000 (23:18 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play" am:
d736cba6e7
am:
be81d28798
* commit '
be81d28798358aed3a3d7de2464242df15e07486':
Add free short codes for Direct Carrier Billing in Google Play
Selim Cinek [Wed, 13 Jan 2016 23:14:26 +0000 (23:14 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am:
d23f1eb0cd
am:
804ff964af
* commit '
804ff964afed8154c5b169cd1f2bb6e89dc05f2f':
Fixed a crash with the heads up manager
xin He [Wed, 13 Jan 2016 23:14:16 +0000 (23:14 +0000)]
Merge "Initial codes for Quality network selection"
Victor Chang [Wed, 13 Jan 2016 23:11:36 +0000 (23:11 +0000)]
Merge "Show work missed call notification for sim call from work contacts"
Ian Pedowitz [Wed, 13 Jan 2016 23:10:41 +0000 (23:10 +0000)]
Merge "Add ITelephonyDebug.aidl"
Ian Pedowitz [Wed, 13 Jan 2016 23:10:29 +0000 (23:10 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am:
624d43b66f
am:
0cd5e9f475
* commit '
0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
Revert "Avoid drawable invalidation during draw()"
Selim Cinek [Wed, 13 Jan 2016 23:10:20 +0000 (23:10 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
am:
d23f1eb0cd
* commit '
d23f1eb0cd9893395573a4059be195e8fdb1007a':
Fixed a crash with the heads up manager
Wale Ogunwale [Wed, 13 Jan 2016 23:10:15 +0000 (23:10 +0000)]
Merge "Fix build breakage."
Pavel Zhamaitsiak [Mon, 4 Jan 2016 23:54:31 +0000 (15:54 -0800)]
Add ITelephonyDebug.aidl
(cherry picked from commit
f91818ca3458f9c1f1d6b6d278f8d6cc2fc14511)
Change-Id: Ie3c846a90632e3afa793e6e60f5a3390a260c5a5
Wale Ogunwale [Wed, 13 Jan 2016 23:08:29 +0000 (15:08 -0800)]
Fix build breakage.
Bug:
22405482
Change-Id: I8fc522885801e9735544ec3820c8fdd4a4368d71
Pavel Zhamaitsiak [Wed, 13 Jan 2016 23:08:20 +0000 (23:08 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am:
9ae30e69ad am:
fba6bccff5
am:
e737a028b1
* commit '
e737a028b1b1151d43e3ecceb1b2bb10e0c75665':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
xinhe [Tue, 1 Dec 2015 22:44:37 +0000 (14:44 -0800)]
Initial codes for Quality network selection
In this change list, the old WifiAutojoin module is
refactored initially. The old WifiAutojoinController is
replaced with a new WifiQualifiedNetworkSelector.
WifiConfiguration, WifiConfigureStore and
WifiStateMachine have been modified accordingly. The new
network selection logic is refactored with a more clear
and deterministci one. To refer to thedescribed in
details, in "Quality Network Selection and Connectivity
Scan Management in N". The link of the document is:
https://docs.google.com/document/d
/1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c
cherry-picked from
8d106780b6a638552749e54e169fc72537d4bccc
and make changes on WiFiConfigurationSerializer.java since
it is not on mm-wireless-dev
Bug:
26012244
Change-Id: I44e454544b630b891c9a58a18b5a028edcce580f
Keisuke Kuroyanagi [Wed, 13 Jan 2016 23:05:34 +0000 (23:05 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries am:
a5c53291a8 am:
3bb115ba5c
am:
404a22cf74
* commit '
404a22cf74f47bbdbeccb3452aefcfd3c34eee74':
Tests for getPrimaryHorizontal with grapheme boundaries
Adam Lesinski [Wed, 13 Jan 2016 23:03:08 +0000 (23:03 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am:
f2cc98bc96 am:
112e26646f
am:
dd0957caf4 -s ours
* commit '
dd0957caf4d16c46971444b00befb415f9a6d549':
UsageStats: Fix issue where initializing data for first time would cause crash
Ian Pedowitz [Wed, 13 Jan 2016 23:01:29 +0000 (23:01 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am:
624d43b66f
* commit '
624d43b66f039e3b0f33274486512621919d96a3':
Revert "Avoid drawable invalidation during draw()"
Selim Cinek [Wed, 13 Jan 2016 23:01:13 +0000 (23:01 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
Ian Pedowitz [Wed, 13 Jan 2016 22:47:45 +0000 (22:47 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
Victor Chang [Mon, 4 Jan 2016 15:48:09 +0000 (15:48 +0000)]
Show work missed call notification for sim call from work contacts
BUG=
26082618
Change-Id: I82bf3d9835589a309101b23536748ae2b27b1d2d
Xiyuan Xia [Wed, 13 Jan 2016 22:32:21 +0000 (22:32 +0000)]
Merge "Fix a race condition during async credential check"
Filip Gruszczynski [Wed, 13 Jan 2016 22:01:05 +0000 (22:01 +0000)]
Merge "Fix delivery of visible behind cancel action."
Filip Gruszczynski [Wed, 13 Jan 2016 21:22:44 +0000 (13:22 -0800)]
Fix delivery of visible behind cancel action.
Bug:
26471802
Change-Id: I4e35f904080d1c57bbb034725d34d8c5bca87238
Yin-Chia Yeh [Wed, 13 Jan 2016 21:50:02 +0000 (21:50 +0000)]
Merge "Camera: cleanup dead code"
Alan Viverette [Wed, 13 Jan 2016 21:49:10 +0000 (21:49 +0000)]
Revert "Avoid drawable invalidation during draw()"
This reverts commit
e5e59c6da424096da8f57137cdc57d8bd410b079.
Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.
Bug:
26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
Samuel Tan [Wed, 13 Jan 2016 21:42:00 +0000 (13:42 -0800)]
resolve merge conflicts of
3caecaec60 to master.
Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f
Pavel Zhamaitsiak [Wed, 13 Jan 2016 21:40:38 +0000 (21:40 +0000)]
Merge "Add ITelephonyDebug.aidl" into mm-wireless-dev
Robert Sesek [Wed, 13 Jan 2016 21:24:00 +0000 (21:24 +0000)]
Felipe Leme [Wed, 13 Jan 2016 21:23:09 +0000 (21:23 +0000)]
Merge "Save bugreport info on share intent."
Selim Cinek [Fri, 6 Nov 2015 19:33:20 +0000 (11:33 -0800)]
Fixed a crash with the heads up manager
Bug:
25693389
Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b
Felipe Leme [Wed, 13 Jan 2016 02:12:09 +0000 (18:12 -0800)]
Save bugreport info on share intent.
When a bugreport is finished, BugreportProgressService sends a
INTENT_BUGREPORT_SHARE intent containing the bugreport pid; then when
the user clicks the share notification, BugreportProgressService uses
the pid to retrieve the bugreport info.
The problem with this approach is that if the service dies before the
user clicks the notification, the bugreport won't be shared.
This change fix this scenario by saving the bugreport info in the share intent.
BUG:
26513652
Also added more logging statements.
Change-Id: Iba86d06369f843ad88194fb1dad0c8b69764df78
Chong Zhang [Wed, 13 Jan 2016 20:55:55 +0000 (20:55 +0000)]
Merge "Several fixes for docking non-resizeable tasks"
Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]
UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/
26355386
Bug:
26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
Robert Greenwalt [Wed, 13 Jan 2016 20:48:14 +0000 (20:48 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play"
am:
d736cba6e7
* commit '
d736cba6e7f93a2e6df172a644e413f27a1dc939':
Add free short codes for Direct Carrier Billing in Google Play
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:44:08 +0000 (20:44 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am:
9ae30e69ad
am:
fba6bccff5
* commit '
fba6bccff5d230b581e46ed64911d0c67e4be442':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Makoto Onuki [Mon, 11 Jan 2016 22:05:15 +0000 (14:05 -0800)]
API for blocked number provider
Bug
26232372
Change-Id: I4d243c00ab9f02af527a96d7b549abfe7876f565
Robert Sesek [Wed, 13 Jan 2016 18:51:07 +0000 (13:51 -0500)]
Fix SDK docs after
b9a8666eb5504f022343fef9087135b7d937ddf8.
Change-Id: Icad19dd1c888b4857d288b460d88bebb9ec20a13
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:35:46 +0000 (20:35 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev
am:
9ae30e69ad
* commit '
9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Robert Greenwalt [Wed, 13 Jan 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play"
Chong Zhang [Wed, 13 Jan 2016 18:39:51 +0000 (10:39 -0800)]
Several fixes for docking non-resizeable tasks
- Keep track of original task bounds and scrolled bounds separately,
so that we can reset the scrolling when the it's no longer in effect.
- Calculate the vertical offset for the toast on top half using the
content rect. The original toast position was relative to the bottom
of the content rect, not the display rect.
- Move toast display to prepareSurfaceLocked, as performShowLocked() may
not be called if the app surface is already shown.
related-to: b/
26451625
related-to: b/
26447921
Change-Id: I82113683c9e3c3beb4938dbd0829d0abf491efd9
Julia Reynolds [Wed, 13 Jan 2016 20:30:48 +0000 (20:30 +0000)]
Merge "Mock compliance for notification guts."
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:30:46 +0000 (20:30 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev
xin He [Wed, 13 Jan 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev
am:
5961142109 -s ours
* commit '
596114210980ae89d040ee86a5daad257c6e5f4c':
Initial codes for Quality network selection [DO NOT MERGE]
Julia Reynolds [Tue, 12 Jan 2016 13:47:04 +0000 (08:47 -0500)]
Mock compliance for notification guts.
Change-Id: I6fc63ad5b9c241d5e003a9810fde6f5aea48214e
xin He [Wed, 13 Jan 2016 20:03:50 +0000 (20:03 +0000)]
Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev
Adam Lesinski [Wed, 13 Jan 2016 20:03:26 +0000 (20:03 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash"
Dongwon Kang [Wed, 13 Jan 2016 20:01:22 +0000 (20:01 +0000)]
Merge "MediaResourceMonitor: Shorten the TAG"
Chong Zhang [Wed, 13 Jan 2016 19:52:45 +0000 (19:52 +0000)]
Merge "Fix rect convert from screen to surface coordinates with scaling"
Dongwon Kang [Wed, 13 Jan 2016 19:39:38 +0000 (11:39 -0800)]
MediaResourceMonitor: Shorten the TAG
Bug:
26541185
Change-Id: Iad1115cfc31b458dc0daa0fe37efd795fb0a32fb
Sandra Kwan [Wed, 13 Jan 2016 19:46:21 +0000 (19:46 +0000)]
Merge "AccountManager: make account session APIs SystemApi."
Chong Zhang [Wed, 13 Jan 2016 18:33:27 +0000 (10:33 -0800)]
Fix rect convert from screen to surface coordinates with scaling
When there is scaling, the top/left coordinates are also scaled. They
could be non-zero if the app is being cropped (eg. due to two-finger
scroll).
bug:
26451625
Change-Id: I90d537347b312d2438993780f52b023c2332eb68