235574 Commits

Author SHA1 Message Date
Jeff Tinker
5a5d56b9ef Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev 2016-03-15 16:59:47 +00:00
Eric Laurent
c92315b91d Merge "Add media.log to Watchdog stacks" into nyc-dev 2016-03-15 16:58:19 +00:00
Adam Powell
421806380d Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev 2016-03-15 16:51:03 +00:00
Amith Yamasani
0b31233277 Merge "Removed an unnecessary log message" into nyc-dev 2016-03-15 16:26:46 +00:00
Kirill Grouchnikov
a487ab1368 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 2016-03-15 16:25:50 +00:00
Amith Yamasani
c0f7e5dbfa Removed an unnecessary log message
Change-Id: I381c46fd355fc5697531d0d6931a60def4ee1b89
2016-03-15 09:24:26 -07:00
Sami Tolvanen
47ad0f2be5 Update factory reset notification text
Bug: 27308928
Bug: 26902605
Change-Id: I8bb9380541a4446c96665c6d5f348d1c62b617a7
2016-03-15 08:14:10 -07:00
Vasco Brito
0efa9e1279 Merge "Add short codes for DCB to free UK and 44567 to standard US." into nyc-dev 2016-03-15 14:56:46 +00:00
Dongwon Kang
49fd7f1d6e Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev 2016-03-15 14:50:48 +00:00
Dongwon Kang
89813b8162 TIF: Add annotations for the system APIs which requires permissions
Bug: 25726241
Change-Id: I2c1c8fb04c7299f9010c7f3ed0aca2e4f1e8b7bd
2016-03-15 07:49:53 -07:00
Alan Viverette
f068cff176 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev 2016-03-15 14:36:11 +00:00
John Reck
0e48bc913d Merge "Switch back to UI-driven AVD" into nyc-dev 2016-03-15 14:31:00 +00:00
Michal Karpinski
57f8462f56 Merge "Addressing API council feedback for remote bugreports" into nyc-dev 2016-03-15 14:08:23 +00:00
Przemyslaw Szczepaniak
1531743a7a Track libcore change 471945701ad7895acf0dae73f90a5f18cd9ca23a
Bug: 27426684
Change-Id: I4b2a5840cb61aa379da0ca11292781ceac14f93d
2016-03-15 13:24:45 +00:00
Michal Karpinski
37cfe71693 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
2016-03-15 11:35:34 +00:00
Przemyslaw Szczepaniak
43ed24648f Track libcore commit e8b323c7cb7d55be9a4df579231e44f04f53d766
Bug: 27426599
Change-Id: Ie652b5fcf37b12e477ff2929df33d32b074262d4
2016-03-15 11:14:59 +00:00
Tomasz Mikolajewski
c51263be1c Merge "Optimize sorting performance by 7.64% in DocumentsUI." into nyc-dev 2016-03-15 09:32:08 +00:00
Jaesung Chung
1a506af9a2 Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev 2016-03-15 08:27:38 +00:00
Jaesung Chung
49371caff0 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
2016-03-15 17:26:42 +09:00
Keisuke Kuroyanagi
531d8d2fae Merge "Re-disable drag and drop in full screen extracted mode." into nyc-dev 2016-03-15 08:21:11 +00:00
Keisuke Kuroyanagi
126fdf1082 Merge "Stop automatically creating selection action mode." into nyc-dev 2016-03-15 07:41:07 +00:00
Tomasz Mikolajewski
77f0595cd1 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
2016-03-15 16:05:59 +09:00
Keisuke Kuroyanagi
794f70f172 Merge "Add a check for misspelled span change." into nyc-dev 2016-03-15 06:47:10 +00:00
Keisuke Kuroyanagi
6e0860d959 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
2016-03-15 15:40:43 +09:00
Keisuke Kuroyanagi
c477b5830a 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
2016-03-15 15:38:40 +09:00
Keisuke Kuroyanagi
fdfc93d770 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
2016-03-15 14:47:08 +09:00
Keisuke Kuroyanagi
3e540b95d7 Merge "Fix: onExtractedDeleteText deletes unintended region." into nyc-dev 2016-03-15 05:38:06 +00:00
Keisuke Kuroyanagi
e675665afa Merge "Show SuggestionsPopup when there is a misspelled span." into nyc-dev 2016-03-15 05:35:21 +00:00
Adrian Roos
7400f82699 Merge "Don't show wallpaper when backdrop is visible" into nyc-dev 2016-03-15 03:26:02 +00:00
Daichi Hirono
aa0fa38432 Merge "Regard timeout as an error in the MtpDocumentsProvider test." into nyc-dev 2016-03-15 02:36:46 +00:00
Daichi Hirono
acb0e27bb3 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
2016-03-15 11:35:34 +09:00
Tyler Gunn
32d1a1a911 Merge "Add API support for multi-endpoint." into nyc-dev 2016-03-15 01:59:43 +00:00
Adrian Roos
d5c2db630f 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
2016-03-14 18:55:41 -07:00
Eric Laurent
05d4e35c8e Add media.log to Watchdog stacks
Needed for debugging after mediaserver split.

Bug: 27408518
Change-Id: I412575264e813688396835f4f3501f6132432960
2016-03-14 18:49:08 -07:00
Carlos Valdivia
658e4c5ece Merge "Permissions: Get rid of GET_ACCOUNTS" into nyc-dev 2016-03-15 01:36:26 +00:00
Jim Miller
6593c28c31 Merge "Attempt to fix problem where keyguard isn't locking" into nyc-dev 2016-03-15 01:26:17 +00:00
Chris Craik
b6692a3ae6 Merge "Return <0 if undefined Outline radius" into nyc-dev 2016-03-15 00:51:34 +00:00
Wale Ogunwale
deee942be1 Merge "Added input freeze reason string." into nyc-dev 2016-03-15 00:32:19 +00:00
Makoto Onuki
84dce8cba9 Merge "Make "reset-throttling" per-user" into nyc-dev 2016-03-15 00:31:41 +00:00
Yin-Chia Yeh
b00df4192b Merge "Camera: fix expectation of BLOB buffer size" into nyc-dev 2016-03-15 00:16:58 +00:00
John Reck
7ab0f835e6 Switch back to UI-driven AVD
Bug: 27550546
Change-Id: I7c37438555fb8a72d2ff0bc42bf5de25a31cc464
2016-03-14 17:16:10 -07:00
Chris Craik
fb354a3752 Return <0 if undefined Outline radius
bug:27531289

Change-Id: I0a2880693c59406e2d610f3a11020cde5379e230
2016-03-14 17:04:24 -07:00
Sudheer Shanka
13e22319e4 Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev 2016-03-14 23:51:13 +00:00
Chris Craik
d06fa51e6b Merge "Unrounded round rects are just rects" into nyc-dev 2016-03-14 23:49:37 +00:00
Aga Wronska
0ce9af0971 Merge "Suppress tests failing because or permission inconsistency" into nyc-dev 2016-03-14 23:31:36 +00:00
Tyler Gunn
876dbfb476 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
2016-03-14 23:26:34 +00:00
Yin-Chia Yeh
7b79090252 Camera: fix expectation of BLOB buffer size
Bug: 27340302
Change-Id: I7f40065661d06bba210c3cb888598623fad0e56c
2016-03-14 16:17:38 -07:00
Tyler Gunn
76bd11cb05 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.
2016-03-14 23:17:27 +00:00
Tyler Gunn
3d09db6f7a 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
2016-03-14 16:06:11 -07:00
Chris Craik
2dbb4c46ee Unrounded round rects are just rects
Change-Id: I66517390943192e4725251b316a3d8c332c2b77d
2016-03-14 15:58:44 -07:00