OSDN Git Service
Etan Cohen [Tue, 15 Mar 2016 22:10:17 +0000 (22:10 +0000)]
[NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]
am:
8414f5cf2b -s ours
* commit '
8414f5cf2bd86dcbaea1976590e838e41af554b3':
[NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]
Etan Cohen [Tue, 15 Mar 2016 22:10:15 +0000 (22:10 +0000)]
[NAN] Replace session callback configuration control [DO NOT MERGE]
am:
e393f57d0d -s ours
* commit '
e393f57d0de5a27d1cfd04a8c83a61559430539c':
[NAN] Replace session callback configuration control [DO NOT MERGE]
Etan Cohen [Tue, 15 Mar 2016 22:05:27 +0000 (22:05 +0000)]
[NAN] Expose match style configuration as public API. [DO NOT MERGE]
am:
8ef7453416 -s ours
* commit '
8ef74534169bd3f3296e2ee42c0fda95c8518383':
[NAN] Expose match style configuration as public API. [DO NOT MERGE]
Tao Bao [Tue, 15 Mar 2016 22:02:06 +0000 (22:02 +0000)]
Merge "Don't reboot into recovery if block map file is missing." into nyc-dev
Wei Liu [Tue, 15 Mar 2016 21:50:06 +0000 (21:50 +0000)]
Merge "Add null-checks to mStatusBar." into nyc-dev
Wei Liu [Tue, 15 Mar 2016 21:48:52 +0000 (21:48 +0000)]
Merge "The startup of the system services should be conditional." into nyc-dev
Wei Wang [Tue, 15 Mar 2016 21:31:57 +0000 (21:31 +0000)]
Merge "Fix device reboot when ranging empty params." into nyc-dev
Chris Wren [Tue, 15 Mar 2016 21:03:57 +0000 (21:03 +0000)]
Merge "fix NPE when dump wins the race against emit" into nyc-dev
Makoto Onuki [Tue, 15 Mar 2016 21:02:47 +0000 (21:02 +0000)]
Merge "Fix launcher side callback" into nyc-dev
Felipe Leme [Tue, 15 Mar 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Log received intent." into nyc-dev
Felipe Leme [Tue, 15 Mar 2016 20:47:05 +0000 (13:47 -0700)]
Log received intent.
BUG:
27660862
Change-Id: Ibe49080c15448ac2672f5e1d5eeaf6d9ff8d282e
Wei Liu [Fri, 4 Mar 2016 22:50:16 +0000 (14:50 -0800)]
The startup of the system services should be conditional.
The system services not used by Wear is tracked in go/ncwss
b/
26877020
Change-Id: I45f77aecbdf4d4a54fef592d543e928b6a8cd6b9
Felipe Leme [Tue, 15 Mar 2016 17:41:49 +0000 (10:41 -0700)]
Handle AccountManager failures so Shell doesn't crash.
BUG:
27665208
Change-Id: Iccb6ce810c8e1c93bded58871d7ec220b7d14ba9
Mahaver Chopra [Tue, 15 Mar 2016 19:48:32 +0000 (19:48 +0000)]
Merge "Update DPM.reboot with new restriction" into nyc-dev
Mahaver Chopra [Fri, 11 Mar 2016 15:39:48 +0000 (15:39 +0000)]
Update DPM.reboot with new restriction
DPM.reboot() should not be called when there is an ongoing call on the
device.
Bug:
27531799
Change-Id: Idc1fa4c7aa79b20ec9c2afcccf855455ee316787
Makoto Onuki [Tue, 15 Mar 2016 00:31:49 +0000 (17:31 -0700)]
Fix launcher side callback
- Fix crash in work profile case
- Calculate shortcuts for each caller
- Add tests
Bug
27548047
Change-Id: I1a5b6a96956abac75d01eb5cc1cec9a9e8e379a3
Jason Monk [Tue, 15 Mar 2016 19:25:19 +0000 (19:25 +0000)]
Merge "Fix crashes during density changes" into nyc-dev
Lajos Molnar [Tue, 15 Mar 2016 19:22:27 +0000 (19:22 +0000)]
Merge "media: don't expose private keys in MediaFormat" into nyc-dev
Sudheer Shanka [Tue, 15 Mar 2016 18:50:00 +0000 (18:50 +0000)]
Merge "Show admin support dialog if app is suspended." into nyc-dev
Felipe Leme [Tue, 15 Mar 2016 18:43:46 +0000 (18:43 +0000)]
Merge "Add a "Do not ask again" checkbox." into nyc-dev
Dimitry Ivanov [Tue, 15 Mar 2016 18:23:01 +0000 (18:23 +0000)]
Merge "Restore fix for native activity without a java-code" into nyc-dev
Andrii Kulian [Tue, 15 Mar 2016 18:19:11 +0000 (18:19 +0000)]
Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev
Chris Tate [Tue, 15 Mar 2016 18:15:36 +0000 (18:15 +0000)]
Merge "Don't stomp live wallpapers when tidying up imagery" into nyc-dev
Felipe Leme [Thu, 10 Mar 2016 01:40:49 +0000 (17:40 -0800)]
Add a "Do not ask again" checkbox.
When an app request access to a scoped directory which the user already
denied access, it will display a "Do not ask again" checkbox; if the
user checks that option, further requests will be automatically
rejected.
The history of denials is stored in the shared property file.
The UI is not polished yet, the style will be fixed in a future change.
BUG:
26750152
Change-Id: I181923adfb6a1c7c1c17e305d6838314280417fc
Wei Liu [Fri, 4 Mar 2016 18:52:33 +0000 (10:52 -0800)]
Add null-checks to mStatusBar.
So that we can disable StatusBarManagerService on Wear.
b/
26877020
Change-Id: I9e2a84f004ddf5a4aec50a84cad76d2a10c701b8
Ronghua Wu [Tue, 15 Mar 2016 17:40:13 +0000 (17:40 +0000)]
Merge "core: add hdr capabilities to display" into nyc-dev
Sudheer Shanka [Fri, 11 Mar 2016 20:25:51 +0000 (12:25 -0800)]
Show admin support dialog if app is suspended.
Bug:
26922950
Change-Id: I21f048873244df52d14910cc01a658af476d9149
Tao Bao [Tue, 15 Mar 2016 00:11:05 +0000 (17:11 -0700)]
Don't reboot into recovery if block map file is missing.
We added a third parameter to RecoverySystem.installPackage() to let the
caller to indicate the package has been processed (uncrypt'd). We need
to ensure the caller's claim is true by checking the existence of the
block map. Otherwise the device will fail for sure when booting into
recovery.
Bug:
27620932
Change-Id: I6325455253480055f14eb0cf020689ac37328602
Alan Viverette [Tue, 15 Mar 2016 17:23:34 +0000 (17:23 +0000)]
Merge "Rename undefined inset constant" into nyc-dev
Hall Liu [Mon, 14 Mar 2016 23:38:56 +0000 (16:38 -0700)]
Un-hide Connection#onReject(String) and its associated capability
The capability is CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION
Bug:
27501686
Change-Id: Id73bb99650ca8440a9f4e87bfe533a97c4d19778
Dimitry Ivanov [Tue, 15 Mar 2016 00:15:38 +0000 (17:15 -0700)]
Restore fix for native activity without a java-code
The regression was introduced by
39bfee5e3674faea992c32204abc1c03429b8cda
which undid the fix to classloader construction.
This commit reapplies the fix from
b9c9026bdd0076014aeca62b088053d8fbce2326
Bug: http://b/
27250344
Change-Id: I6c341d911ba0f311c63e380dd9dd064ba2faf391
Yi Kong [Tue, 15 Mar 2016 16:59:59 +0000 (16:59 +0000)]
Track libcore commit
d41ca4a76ea570f9dd89a7ae56410cc75cc0a856
Bug:
27538943
Change-Id: I91fc2e9738dcfb7be061041b5e000b21e7684184
(cherry picked from commit
f45eca1d72a26feca68f74149afc4a8c6c91fde4)
(cherry picked from commit
e72e604beae9a37834cbd1bff8eaeafd5810ed92)
Ian Pedowitz [Tue, 15 Mar 2016 17:09:51 +0000 (17:09 +0000)]
Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev
Michal Karpinski [Tue, 15 Mar 2016 17:09:31 +0000 (17:09 +0000)]
Merge "Logging of setting ro.device_owner property" into nyc-dev
Ian Pedowitz [Tue, 15 Mar 2016 17:08:27 +0000 (17:08 +0000)]
Revert "Permissions: Get rid of GET_ACCOUNTS"
This reverts commit
d39600585bcb720d739ef6f0091066e3d4f77765.
Bug:
27665091
Change-Id: I7d017ba7062ac594225229436d2877c7d21fb065
Michal Karpinski [Tue, 15 Mar 2016 17:04:59 +0000 (17:04 +0000)]
Logging of setting ro.device_owner property
Without logging of setting it's impossible to test the setup, unless
device is rooted.
Bug:
22860162
Change-Id: I0532654ef4e4b7272d2749b30590a1b47da9f645
Jeff Tinker [Tue, 15 Mar 2016 16:59:46 +0000 (16:59 +0000)]
Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev
Eric Laurent [Tue, 15 Mar 2016 16:58:17 +0000 (16:58 +0000)]
Merge "Add media.log to Watchdog stacks" into nyc-dev
Adam Powell [Tue, 15 Mar 2016 16:51:02 +0000 (16:51 +0000)]
Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev
Chris Wren [Tue, 15 Mar 2016 16:47:26 +0000 (12:47 -0400)]
fix NPE when dump wins the race against emit
Bug:
27673660
Change-Id: I4e00933ef38f2847f5f759cfed9dfaea20e04d73
Alan Viverette [Tue, 15 Mar 2016 16:43:41 +0000 (12:43 -0400)]
Rename undefined inset constant
Bug:
27531289
Change-Id: I31c5cc295c7f36b934eccf46cdbe7a7b293af9e0
Jason Monk [Tue, 15 Mar 2016 16:41:13 +0000 (12:41 -0400)]
Fix crashes during density changes
Bug:
27516933
Change-Id: Ibffa2f4d68c8c4aff09e74ee4dfb073d7d7bc8c5
Amith Yamasani [Tue, 15 Mar 2016 16:26:45 +0000 (16:26 +0000)]
Merge "Removed an unnecessary log message" into nyc-dev
Kirill Grouchnikov [Tue, 15 Mar 2016 16:25:48 +0000 (16:25 +0000)]
Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev
Amith Yamasani [Tue, 15 Mar 2016 16:24:26 +0000 (09:24 -0700)]
Removed an unnecessary log message
Change-Id: I381c46fd355fc5697531d0d6931a60def4ee1b89
Sami Tolvanen [Thu, 10 Mar 2016 00:15:13 +0000 (16:15 -0800)]
Update factory reset notification text
Bug:
27308928
Bug:
26902605
Change-Id: I8bb9380541a4446c96665c6d5f348d1c62b617a7
Vasco Brito [Tue, 15 Mar 2016 14:56:45 +0000 (14:56 +0000)]
Merge "Add short codes for DCB to free UK and 44567 to standard US." into nyc-dev
Dongwon Kang [Tue, 15 Mar 2016 14:50:46 +0000 (14:50 +0000)]
Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev
Dongwon Kang [Mon, 14 Mar 2016 18:10:38 +0000 (11:10 -0700)]
TIF: Add annotations for the system APIs which requires permissions
Bug:
25726241
Change-Id: I2c1c8fb04c7299f9010c7f3ed0aca2e4f1e8b7bd
Alan Viverette [Tue, 15 Mar 2016 14:36:10 +0000 (14:36 +0000)]
Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev
John Reck [Tue, 15 Mar 2016 14:30:58 +0000 (14:30 +0000)]
Merge "Switch back to UI-driven AVD" into nyc-dev
Michal Karpinski [Tue, 15 Mar 2016 14:08:22 +0000 (14:08 +0000)]
Merge "Addressing API council feedback for remote bugreports" into nyc-dev
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 13:24:45 +0000 (13:24 +0000)]
Track libcore change
471945701ad7895acf0dae73f90a5f18cd9ca23a
Bug:
27426684
Change-Id: I4b2a5840cb61aa379da0ca11292781ceac14f93d
Michal Karpinski [Fri, 11 Mar 2016 14:00:13 +0000 (14:00 +0000)]
Addressing API council feedback for remote bugreports
In DeviceAdminReceiver fixed a broken link in javadocs and improved
javadocs for bugreport error codes.
Bug:
27532425
Change-Id: I6cf90b4109065615778e69ea9d21b1869841593b
Przemyslaw Szczepaniak [Tue, 15 Mar 2016 11:11:21 +0000 (11:11 +0000)]
Track libcore commit
e8b323c7cb7d55be9a4df579231e44f04f53d766
Bug:
27426599
Change-Id: Ie652b5fcf37b12e477ff2929df33d32b074262d4
Tomasz Mikolajewski [Tue, 15 Mar 2016 09:32:06 +0000 (09:32 +0000)]
Merge "Optimize sorting performance by 7.64% in DocumentsUI." into nyc-dev
Jaesung Chung [Tue, 15 Mar 2016 08:27:37 +0000 (08:27 +0000)]
Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev
Jaesung Chung [Mon, 14 Mar 2016 05:57:54 +0000 (14:57 +0900)]
ExifInterface: handle the invalid offsets and count numbers
Some JPEG images generated by various camera vendors have wrong offsets
and invalid numbers for indicating the size of components. Instead of
throwing exceptions, this CL makes Exifinterface ignore these cases to
read the information without losing contents already parsed.
Bug:
27583378
Change-Id: Ie8ee0bf49283ef519f4f31c5b8ba78ce3f82fe92
Keisuke Kuroyanagi [Tue, 15 Mar 2016 08:21:09 +0000 (08:21 +0000)]
Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev
Keisuke Kuroyanagi [Tue, 15 Mar 2016 07:41:06 +0000 (07:41 +0000)]
Merge "Stop automatically creating selection action mode." into nyc-dev
Tomasz Mikolajewski [Tue, 15 Mar 2016 04:23:52 +0000 (13:23 +0900)]
Optimize sorting performance by 7.64% in DocumentsUI.
This CL prevents allocating new strings just due to the prefix,
which also simplifies the code.
Bug:
27286016
Change-Id: I3d0ea9e4ede68814c78404bd9ac820b8900851f5
Andrii Kulian [Fri, 11 Mar 2016 05:56:35 +0000 (21:56 -0800)]
Update ActivityOptions#setLaunchBounds() docs
Update docs to provide more info about parameter format.
Bug:
27364884
Change-Id: I04dd2e868d64d3f023fcaa4891b40b60a2f549d6
Keisuke Kuroyanagi [Tue, 15 Mar 2016 06:47:09 +0000 (06:47 +0000)]
Merge "Add a check for misspelled span change." into nyc-dev
Keisuke Kuroyanagi [Tue, 15 Mar 2016 06:40:43 +0000 (15:40 +0900)]
Add a check for misspelled span change.
Previously, misspelled span is directly used in AddToDicitonary's
OnClickListener. It can crash because misspelled span can have been
updated since SuggestiosPopup is shown.
Also, AddToDictionary didn't work correctly in full screen extracted
mode. Use findEquivalentSuggestionSpan to resolve it.
Bug:
27557526
Change-Id: I51d713dbdd0c44ea2c553164b81b1123a2325aa1
Keisuke Kuroyanagi [Tue, 15 Mar 2016 06:38:40 +0000 (15:38 +0900)]
Stop automatically creating selection action mode.
With Ic025c109539c3b5963, selection action mode is created always
when selection is made. It causes distraction in some cases.
This CL fixes this issue. This CL stops starting selection action
mode when action mode is currently not active and not intended to
restart.
Bug:
27536744
Bug:
27551819
Change-Id: I94ee66864000934a21ef0d18c1d71429c67114fa
Keisuke Kuroyanagi [Tue, 15 Mar 2016 05:47:08 +0000 (14:47 +0900)]
Re-disable drag and drop in full screen extracted mode.
Drag and drop in full screen extracted mode was disabled by
Ifff4c30919bcb04f7d and re-enabled by I90d8e9f42f395b6b52.
However, related issues have not been fixed. This CL re-disables it.
Bug:
22440907
Change-Id: I753f69e170aa7e79478a5a4a3b89e4a7ef88c9e2
Keisuke Kuroyanagi [Tue, 15 Mar 2016 05:38:05 +0000 (05:38 +0000)]
Merge "Fix: onExtractedDeleteText deletes unintended region." into nyc-dev
Keisuke Kuroyanagi [Tue, 15 Mar 2016 05:35:20 +0000 (05:35 +0000)]
Merge "Show SuggestionsPopup when there is a misspelled span." into nyc-dev
Adrian Roos [Tue, 15 Mar 2016 03:26:00 +0000 (03:26 +0000)]
Merge "Don't show wallpaper when backdrop is visible" into nyc-dev
Daichi Hirono [Tue, 15 Mar 2016 02:36:44 +0000 (02:36 +0000)]
Merge "Regard timeout as an error in the MtpDocumentsProvider test." into nyc-dev
Daichi Hirono [Mon, 14 Mar 2016 12:49:14 +0000 (21:49 +0900)]
Regard timeout as an error in the MtpDocumentsProvider test.
Previously if DocumentsProvider found timeout when terminatnig
RootScanner's background thread, it just output it in error log. Thus
the timeout is not regarded as an error in MtpDocumentsProviderTest, and
it makes flaky PipeManagerTest which runs just after
MtpDocumentsProviderTest.
The CL
* lets MtpDocumentsProvider throw TimeoutException for timeout.
* removes redundant resumeRootScanner calls to avoid timeout of
RootScanner#pause.
Also the CL did cleanup the logic that pauses RootScanner when we don't
find any devices. Previously the logic was in
MtpDocumentsProvider#closeInternal but it is not efficient because we
invokes RootScanner#resume just after
MtpDocumentsProvider#closeInternal. Now the CL moves the logic to
RootScanner so that it can pause itself automatically.
BUG=
27638500
Change-Id: Ic11bca67c099cbb0f46679db2f035988045d67d6
Tyler Gunn [Tue, 15 Mar 2016 01:59:41 +0000 (01:59 +0000)]
Merge "Add API support for multi-endpoint." into nyc-dev
Adrian Roos [Wed, 9 Mar 2016 00:11:31 +0000 (16:11 -0800)]
Don't show wallpaper when backdrop is visible
Hides the wallpaper when it's not needed and fixes
the unlock animation to not unnecessairly show the
wallpaper if neither the Keyguard nor the underlying
app need it.
Also fixes a bug where the enter animation had a background
set, which led to uglyness when no wallpaper is involved.
Bug:
27533740
Change-Id: I667c6f7ca6c0e1ff7e9f793c6ddc13f6da8387b1
Eric Laurent [Tue, 15 Mar 2016 01:49:08 +0000 (18:49 -0700)]
Add media.log to Watchdog stacks
Needed for debugging after mediaserver split.
Bug:
27408518
Change-Id: I412575264e813688396835f4f3501f6132432960
Carlos Valdivia [Tue, 15 Mar 2016 01:36:24 +0000 (01:36 +0000)]
Merge "Permissions: Get rid of GET_ACCOUNTS" into nyc-dev
Jim Miller [Tue, 15 Mar 2016 01:26:16 +0000 (01:26 +0000)]
Merge "Attempt to fix problem where keyguard isn't locking" into nyc-dev
Etan Cohen [Fri, 11 Mar 2016 19:25:23 +0000 (11:25 -0800)]
[NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]
Merge onPublishFail & onSubscribeFail into onSessionConfigFail.
Merge onPublishTerminated & onSubscribeTerminated into onSessionTerminated.
A session is either publish or subscribe (never the two) so redundant.
Bug:
27610709
Change-Id: I0282d17db88754428da25ee5f064b9a4805f9736
Etan Cohen [Fri, 11 Mar 2016 18:14:21 +0000 (10:14 -0800)]
[NAN] Replace session callback configuration control [DO NOT MERGE]
Controlling session callback invocation:
- Remove event registration
- Add configurations to the subset (actually just termination) which
can be configured through the HAL
Bug:
27607613
Change-Id: I608314cc2a9b077b4d5a2d2d0d315d55c6a7724b
Etan Cohen [Wed, 9 Mar 2016 19:16:45 +0000 (11:16 -0800)]
[NAN] Expose match style configuration as public API. [DO NOT MERGE]
Match style allows apps to configure getting a single notification
or continuous notifications (for all matches).
Bug:
27568256
Change-Id: I9b7bd2e4e58af5c73188267d11c1288a93cf64ed
Chris Craik [Tue, 15 Mar 2016 00:51:33 +0000 (00:51 +0000)]
Merge "Return <0 if undefined Outline radius" into nyc-dev
Christopher Tate [Tue, 15 Mar 2016 00:36:16 +0000 (17:36 -0700)]
Don't stomp live wallpapers when tidying up imagery
Tidying up the wallpaper imagery bookkeeping mustn't accidentally
overwrite any user-selected live wallpaper usage. Only do the full
reset when it's needful *and* we expect to need it.
Bug
27537903
Change-Id: Iaacc750a24ef36ee4e4cc436b62055b51b49b235
Wale Ogunwale [Tue, 15 Mar 2016 00:32:17 +0000 (00:32 +0000)]
Merge "Added input freeze reason string." into nyc-dev
Makoto Onuki [Tue, 15 Mar 2016 00:31:39 +0000 (00:31 +0000)]
Merge "Make "reset-throttling" per-user" into nyc-dev
Yin-Chia Yeh [Tue, 15 Mar 2016 00:16:57 +0000 (00:16 +0000)]
Merge "Camera: fix expectation of BLOB buffer size" into nyc-dev
John Reck [Tue, 15 Mar 2016 00:16:10 +0000 (17:16 -0700)]
Switch back to UI-driven AVD
Bug:
27550546
Change-Id: I7c37438555fb8a72d2ff0bc42bf5de25a31cc464
Chris Craik [Tue, 15 Mar 2016 00:04:22 +0000 (17:04 -0700)]
Return <0 if undefined Outline radius
bug:
27531289
Change-Id: I0a2880693c59406e2d610f3a11020cde5379e230
Sudheer Shanka [Mon, 14 Mar 2016 23:51:12 +0000 (23:51 +0000)]
Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev
Chris Craik [Mon, 14 Mar 2016 23:49:36 +0000 (23:49 +0000)]
Merge "Unrounded round rects are just rects" into nyc-dev
Aga Wronska [Mon, 14 Mar 2016 23:31:34 +0000 (23:31 +0000)]
Merge "Suppress tests failing because or permission inconsistency" into nyc-dev
Tyler Gunn [Mon, 14 Mar 2016 22:18:07 +0000 (15:18 -0700)]
Add API support for multi-endpoint.
This CL includes changes required to support multi-endpoint (see the
design doc linked off the bug).
Main changes include:
- support for indicating if a call/connection is "external" to the device.
- support for indicating if an external call can be pulled from the
remote device to the local device.
- API used to initiate a pull of a call external to the current device to
the current device.
- Made the "connection event" API public (was previously @hide); this will
be used to support passing some error events involving pulling calls to
the incall ui.
- Added new InCallService metadata which will be used to determine if an
InCallService wants to be informed of external calls.
- New disconnect causes which will be used to expose the fact that a
multi-endpoint call was answered elsewhere and that a call ended because
it was pulled to another device.
- New call log call types to indicate if calls were answered elsewhere
or pulled to another device.
Bug:
27458894
Change-Id: I423f64ff965b5e50194635a51868c327782db2a1
Yin-Chia Yeh [Mon, 14 Mar 2016 23:17:38 +0000 (16:17 -0700)]
Camera: fix expectation of BLOB buffer size
Bug:
27340302
Change-Id: I7f40065661d06bba210c3cb888598623fad0e56c
Tyler Gunn [Mon, 14 Mar 2016 23:17:27 +0000 (23:17 +0000)]
DO NOT MERGE Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
am:
3d09db6f7a -s ours
* commit '
3d09db6f7a181b26e2541b90b379d68ab0f8ed32':
DO NOT MERGE Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
Tyler Gunn [Mon, 14 Mar 2016 23:06:11 +0000 (16:06 -0700)]
DO NOT MERGE Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.
Bug:
20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
Chris Craik [Sat, 12 Mar 2016 02:58:37 +0000 (18:58 -0800)]
Unrounded round rects are just rects
Change-Id: I66517390943192e4725251b316a3d8c332c2b77d
Makoto Onuki [Mon, 14 Mar 2016 22:51:41 +0000 (15:51 -0700)]
Make "reset-throttling" per-user
Also don't reset the counter when the time is invalid
Bug
27549307
Change-Id: Ib9ad030e348ec5e32936709f1284e3c76e88e254
Chris Craik [Mon, 14 Mar 2016 22:48:50 +0000 (22:48 +0000)]
Merge "Fix flickering when layers resize in-place" into nyc-dev
Ryan Bavetta [Mon, 14 Mar 2016 22:48:07 +0000 (22:48 +0000)]
Merge "Adds E2E tests for soundtrigger stub HAL load/start/trigger/stop/unload" into nyc-dev
Chong Zhang [Mon, 14 Mar 2016 22:44:59 +0000 (22:44 +0000)]
Merge "Fixing misc issues that leads to black screen when pressing Home" into nyc-dev
Chong Zhang [Mon, 14 Mar 2016 20:59:32 +0000 (13:59 -0700)]
Fixing misc issues that leads to black screen when pressing Home
- Make sure to clear usingTransferredAnimation flag together when
setting app animator's animation to null. Not clearing it will cause
setAppVisibility to not apply dummy animation (placeholder)
to a closing app token while it should, and the closing app token will
then exit early before the opening app is ready, since it doesn't have
any animation set. This causes a brief blank period.
- When app relayout to invisible, make sure to mark mWinAnimator's
mAnimating to true if we decided exit animation is running. Note that
even if we didn't actually apply the animation (which could happen if
the window is no longer visible by policy), if the app token itself is
under any animation, we need to mark mAnimating otherwise the clean up
code in FinishExit will not run, and the window will be stuck in
Exiting state.
- We no longer change mAnimatingExit flag in setAppVisibility(), but
wait for app's relayoutWindow calls to change it if applicable.
setAppVisibilty doesn't apply the animation until transition is good
to go. Setting the flag without the animation applied will disable
setTokenVisibilityLocked and relayoutWindow to actually apply the
animation, because they may think the window is no longer visible.
bug:
27391256
Change-Id: I292305847d742cdbb5ebe6aa8daa5d83bf65483b
Makoto Onuki [Mon, 14 Mar 2016 22:12:15 +0000 (22:12 +0000)]
Merge "Implement the launcher side permission." into nyc-dev