OSDN Git Service
Daichi Hirono [Wed, 23 Mar 2016 08:42:22 +0000 (08:42 +0000)]
Merge "Revert "Make status bar translucent. Make drawer appera below status bar."" into nyc-dev
am:
b9129be
* commit '
b9129bede266f82089b46af4a4931a42ec9875b2':
Revert "Make status bar translucent. Make drawer appera below status bar."
Daichi Hirono [Wed, 23 Mar 2016 08:32:00 +0000 (08:32 +0000)]
Merge "Revert "Make status bar translucent. Make drawer appera below status bar."" into nyc-dev
Daichi Hirono [Wed, 23 Mar 2016 08:19:30 +0000 (17:19 +0900)]
Revert "Make status bar translucent. Make drawer appera below status bar."
This reverts commit
4639136c3b4bc22064323a193f06d6585e1a171a.
The commit breaks the following CTS tests.
* android.appsecurity.cts.DocumentsTest#testCreateExisting FAIL
* android.appsecurity.cts.DocumentsTest#testCreateNew FAIL
BUG=
27805363,
27570567
Change-Id: Ic9f1d98714a78afe548eb5ae9afa118ddc83cccc
Daichi Hirono [Wed, 23 Mar 2016 07:45:13 +0000 (07:45 +0000)]
Fix the directory item height in grid view.
am:
c545f5e
* commit '
c545f5e6170edcb7af0e834409c06062e7408778':
Fix the directory item height in grid view.
Daichi Hirono [Wed, 23 Mar 2016 07:35:32 +0000 (16:35 +0900)]
Fix the directory item height in grid view.
BUG=
27565668
Change-Id: I3d5615b46542dcd0f22f5e9968d3ee5bfe1af19a
Shuo Gao [Wed, 23 Mar 2016 07:26:55 +0000 (07:26 +0000)]
Merge "Enable shader cache for applications that shared UID with multiple packages too" am:
f3edaf6
am:
177e159 -s ours
* commit '
177e1594f8dafcc20a7ca08046c03498f567cad1':
Enable shader cache for applications that shared UID with multiple packages too
Yohei Yukawa [Wed, 23 Mar 2016 05:51:14 +0000 (05:51 +0000)]
Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev
am:
c1a72b6
* commit '
c1a72b6b74c08b0b304998838d1e792884a6354c':
Remove redundant IMM#mServedInputConnection.
Yohei Yukawa [Wed, 23 Mar 2016 05:41:07 +0000 (05:41 +0000)]
Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev
Yohei Yukawa [Wed, 23 Mar 2016 03:49:26 +0000 (20:49 -0700)]
Remove redundant IMM#mServedInputConnection.
Following two fields have basically the same lifetime.
- InputMethodManager#mServedInputConnection
- InputMethodManager#mServedInputConnectionWrapper
Hence we do not need to maintain both of them.
This is a preparation CL for Bug
25332806 and does not change any
user-visible behavior.
Bug:
25332806
Change-Id: I1181e067aa5bedbdf0c7ec1bcec479257aea511c
Phil Weaver [Wed, 23 Mar 2016 02:43:05 +0000 (02:43 +0000)]
Merge "Fix ACCESSIBILITY_ENABLED settings." into nyc-dev
am:
2ec58a6
* commit '
2ec58a65d2b976d75a063f83bfcb3d1fac5e51e1':
Fix ACCESSIBILITY_ENABLED settings.
Phil Weaver [Wed, 23 Mar 2016 02:36:33 +0000 (02:36 +0000)]
Merge "Fix ACCESSIBILITY_ENABLED settings." into nyc-dev
Jaesung Chung [Wed, 23 Mar 2016 02:36:15 +0000 (02:36 +0000)]
Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev
am:
976bbac
* commit '
976bbaccc47daa700a9ac2fa4fe9b0b759cf343a':
ExifInterface: close the resource after reading EXIF data explicitly
Jaesung Chung [Wed, 23 Mar 2016 02:36:13 +0000 (02:36 +0000)]
Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev
am:
203ed4d5
* commit '
203ed4d50070beaaa463b87d367613da6b7d2ee1':
ExifInterface: fix regression of re-writing JPEG
Jaesung Chung [Wed, 23 Mar 2016 02:30:40 +0000 (02:30 +0000)]
Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev
Jaesung Chung [Wed, 23 Mar 2016 02:30:27 +0000 (02:30 +0000)]
Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev
Daichi Hirono [Wed, 23 Mar 2016 02:29:19 +0000 (02:29 +0000)]
Update an icon for MtpDocumentsProvider.
am:
01e236b
* commit '
01e236b984322242887f15c445604275e9b5781e':
Update an icon for MtpDocumentsProvider.
Jaesung Chung [Tue, 15 Mar 2016 08:25:31 +0000 (17:25 +0900)]
ExifInterface: close the resource after reading EXIF data explicitly
- In case of giving an argument of the image file name or descriptor,
we created a InputStream at the inside of ExifInterface, close them
properly.
- Developers should take care of closing input streams when they use
input streams since they made those input streams.
Bug:
27636804
Change-Id: I9a3a75b1b55dcb2718a60e14814a04cad939d22c
Jaesung Chung [Tue, 22 Mar 2016 18:43:11 +0000 (11:43 -0700)]
ExifInterface: fix regression of re-writing JPEG
Bug:
27583378
Change-Id: I052dfedbb1393705eba378de5eaf3636ed0e65ea
Daichi Hirono [Wed, 23 Mar 2016 02:07:29 +0000 (11:07 +0900)]
Update an icon for MtpDocumentsProvider.
BUG=
27135431
Change-Id: Ic8619a533bdf2426fdf0d3691a883606fa027fb1
Paul Jensen [Wed, 23 Mar 2016 01:22:45 +0000 (01:22 +0000)]
Merge "Fix APF programs to not generate a failing compare of size 0" into nyc-dev
am:
81a00e7
* commit '
81a00e725d0435e4d779acc4740b37c9bbafb933':
Fix APF programs to not generate a failing compare of size 0
Tomasz Mikolajewski [Wed, 23 Mar 2016 01:22:44 +0000 (01:22 +0000)]
Merge "Hide underlying toolbars from TalkBack when covered by ActionMode." into nyc-dev
am:
8ed1e55
* commit '
8ed1e55ea9817a1620c986c3490b38533522573c':
Hide underlying toolbars from TalkBack when covered by ActionMode.
Aga Wronska [Wed, 23 Mar 2016 01:22:42 +0000 (01:22 +0000)]
Merge "Bring the change \'Open drawer when showing copy/move destination screen\' back after fixing problem with tests." into nyc-dev
am:
2686d73
* commit '
2686d7399dfc7c145b776783140fdfb3f597b020':
Bring the change 'Open drawer when showing copy/move destination screen' back after fixing problem with tests.
Pierre Imai [Wed, 23 Mar 2016 01:18:47 +0000 (01:18 +0000)]
Merge "Improve NetworkCapabilities command chaining." into nyc-dev
am:
82a3637
* commit '
82a3637fcec8d81b25827d03bd178a83101de6ab':
Improve NetworkCapabilities command chaining.
Lorenzo Colitti [Wed, 23 Mar 2016 01:17:56 +0000 (01:17 +0000)]
Merge "Fix APF programs to not generate a failing compare of size 0" into nyc-dev
Tomasz Mikolajewski [Wed, 23 Mar 2016 01:16:08 +0000 (01:16 +0000)]
Merge "Hide underlying toolbars from TalkBack when covered by ActionMode." into nyc-dev
Aga Wronska [Wed, 23 Mar 2016 01:15:10 +0000 (01:15 +0000)]
Merge "Bring the change 'Open drawer when showing copy/move destination screen' back after fixing problem with tests." into nyc-dev
Pierre Imai [Wed, 23 Mar 2016 01:11:14 +0000 (01:11 +0000)]
Merge "Improve NetworkCapabilities command chaining." into nyc-dev
Siyamed Sinir [Wed, 23 Mar 2016 01:07:49 +0000 (01:07 +0000)]
Merge "Temporarily disable emoji availability check" into nyc-dev
am:
c7a9018
* commit '
c7a90184e1827a3cfa0a966126720b317563575c':
Temporarily disable emoji availability check
Siyamed Sinir [Wed, 23 Mar 2016 00:58:39 +0000 (00:58 +0000)]
Merge "Temporarily disable emoji availability check" into nyc-dev
Phil Weaver [Wed, 23 Mar 2016 00:54:37 +0000 (17:54 -0700)]
Fix ACCESSIBILITY_ENABLED settings.
A typo meant that the setting reflected the exact opposite of what was
intended.
Bug:
27781201
Change-Id: Icb0d4d585399f147b319093be57d708af4c6dfdc
Siyamed Sinir [Wed, 23 Mar 2016 00:02:54 +0000 (17:02 -0700)]
Temporarily disable emoji availability check
On builds where SMALLER_FONT_FOOTPRINT environment variable is set, some
of the fonts are not included in the build which causes emoji checks to
fail. This CL temporarily disables emoji checks.
Bug:
27785690
Change-Id: Ie32f0aa630c84347588fc87630467c14e985940a
dongwan0605.kim [Wed, 23 Mar 2016 00:46:56 +0000 (00:46 +0000)]
Merge "Fix to snap notification view back when not clearable while updating" into nyc-dev
am:
28d9698
* commit '
28d9698f1d32e6b73361c4ae09f9da47ba0c812a':
Fix to snap notification view back when not clearable while updating
Yohei Yukawa [Wed, 23 Mar 2016 00:40:00 +0000 (00:40 +0000)]
Merge "Explicitly handle null rather than relying on NPE." into nyc-dev
am:
9e31f4d
* commit '
9e31f4d86d0b7c2411ee3d7f73de0124ec9028d1':
Explicitly handle null rather than relying on NPE.
Mady Mellor [Wed, 23 Mar 2016 00:37:19 +0000 (00:37 +0000)]
Merge "Fix to snap notification view back when not clearable while updating" into nyc-dev
Aga Wronska [Wed, 23 Mar 2016 00:15:18 +0000 (17:15 -0700)]
Bring the change 'Open drawer when showing copy/move destination screen'
back after fixing problem with tests.
Revert "Revert "Open drawer when showing copy/move destination screen""
This reverts commit
82ae18c87784b5989c1529b97214d63e5d9d3742.
Fixed:
27479369
Change-Id: I70f98cf543de889a9a728d8d7233f8e7b077f871
Yohei Yukawa [Wed, 23 Mar 2016 00:31:31 +0000 (00:31 +0000)]
Merge "Explicitly handle null rather than relying on NPE." into nyc-dev
Tomasz Mikolajewski [Wed, 23 Mar 2016 00:29:39 +0000 (00:29 +0000)]
Merge "Update colors for list/grid view." into nyc-dev
am:
18bbea9
* commit '
18bbea9c96dabe0960204ed24155f0fbf69c98a2':
Update colors for list/grid view.
Tomasz Mikolajewski [Wed, 23 Mar 2016 00:29:38 +0000 (00:29 +0000)]
Merge "Make the accent color darker in DocumentsUI for better accessibility." into nyc-dev
am:
13bcd7b
* commit '
13bcd7b3c3d1b8dfd72c71604cd95cc49ec33866':
Make the accent color darker in DocumentsUI for better accessibility.
Tomasz Mikolajewski [Wed, 23 Mar 2016 00:20:26 +0000 (00:20 +0000)]
Merge "Update colors for list/grid view." into nyc-dev
Tomasz Mikolajewski [Wed, 23 Mar 2016 00:20:03 +0000 (00:20 +0000)]
Merge "Make the accent color darker in DocumentsUI for better accessibility." into nyc-dev
Mady Mellor [Wed, 23 Mar 2016 00:16:08 +0000 (00:16 +0000)]
Merge "Add content description for gear behind notifications" into nyc-dev
am:
d5d8866
* commit '
d5d8866c675b470c4b08fa48acdcf21cabe8bcd9':
Add content description for gear behind notifications
Mady Mellor [Wed, 23 Mar 2016 00:07:15 +0000 (00:07 +0000)]
Merge "Add content description for gear behind notifications" into nyc-dev
Dongwon Kang [Tue, 22 Mar 2016 23:54:17 +0000 (23:54 +0000)]
Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev
am:
7b0864c
* commit '
7b0864cc68c3579045bed3bcabe907a81b674bf0':
MediaResourceMonitor: Change argument type from string to int
Winson [Tue, 22 Mar 2016 23:54:15 +0000 (23:54 +0000)]
Merge "Adding assets for dock button." into nyc-dev
am:
138538c
* commit '
138538ce45f7d035c96900378162e5fa7613739d':
Adding assets for dock button.
Dongwon Kang [Tue, 22 Mar 2016 23:50:01 +0000 (23:50 +0000)]
Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev
Winson Chung [Tue, 22 Mar 2016 23:44:36 +0000 (23:44 +0000)]
Merge "Adding assets for dock button." into nyc-dev
Winson [Tue, 22 Mar 2016 23:03:10 +0000 (16:03 -0700)]
Adding assets for dock button.
- Allow nav bar icons to update depending on specific configuration
changes
Bug:
26954184
Change-Id: I1e089c751d2a5785457491b2a204c936d7472145
Selim Cinek [Tue, 22 Mar 2016 23:18:17 +0000 (23:18 +0000)]
Merge "Fixed the default of AlphaOptimizedImageViews overlapping rendering" into nyc-dev
am:
4809b07
* commit '
4809b07297d43265dbae246a28d76db34a77ca65':
Fixed the default of AlphaOptimizedImageViews overlapping rendering
Lifu Tang [Tue, 22 Mar 2016 23:18:15 +0000 (23:18 +0000)]
Merge "A few changes to the measurement implementation" into nyc-dev
am:
145ff55
* commit '
145ff558adb3fa946c792f7d5d49e8f9e746e331':
A few changes to the measurement implementation
Selim Cinek [Tue, 22 Mar 2016 23:12:09 +0000 (23:12 +0000)]
Merge "Fixed the default of AlphaOptimizedImageViews overlapping rendering" into nyc-dev
smain@google.com [Tue, 22 Mar 2016 23:11:28 +0000 (23:11 +0000)]
Merge "switch offline docs back to standard templates that now have a condition for \'referenceonly\' bug:
27667787" into nyc-dev
am:
1dd114e
* commit '
1dd114e5ab9ea6d9fee905a4700103b7584b9596':
switch offline docs back to standard templates that now have a condition for 'referenceonly' bug:
27667787
Aga Wronska [Tue, 22 Mar 2016 23:11:27 +0000 (23:11 +0000)]
Merge "Change copy/move destination to Downloads when home directory is hidden." into nyc-dev
am:
a1b1355
* commit '
a1b13556331136e5e79d0fe545c8bfbb7a394fce':
Change copy/move destination to Downloads when home directory is hidden.
Selim Cinek [Tue, 22 Mar 2016 22:32:00 +0000 (15:32 -0700)]
Fixed the default of AlphaOptimizedImageViews overlapping rendering
The default was true before, which lead to quite a few bugs.
Moved done the introduced attrs to support it on AnimatedImageView
Change-Id: I68714c22ceefff6bac7cd9496c83edd69256ee1b
Fixes:
27745673
Lifu Tang [Tue, 22 Mar 2016 23:08:38 +0000 (23:08 +0000)]
Merge "A few changes to the measurement implementation" into nyc-dev
Scott Main [Tue, 22 Mar 2016 23:05:37 +0000 (23:05 +0000)]
Merge "switch offline docs back to standard templates that now have a condition for 'referenceonly' bug:
27667787" into nyc-dev
Aga Wronska [Tue, 22 Mar 2016 23:03:01 +0000 (23:03 +0000)]
Merge "Change copy/move destination to Downloads when home directory is hidden." into nyc-dev
Lifu Tang [Tue, 22 Mar 2016 20:56:52 +0000 (13:56 -0700)]
A few changes to the measurement implementation
- Fixed the device crashing bug in JNI code
- Fixed a typo ('lock' => 'clock')
- Added hardware clock discontinuity count in toString()
(cherry picked from commit
3a21b02ee2dc8f2c6c879109757d89a2be5d720a)
Change-Id: I6dbda85abda20da0240ac08b22b81729eae7b6f0
Paul Stewart [Tue, 22 Mar 2016 22:27:38 +0000 (22:27 +0000)]
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
am:
68ffbba
* commit '
68ffbba158579dd8b6f32aa628ec91228786e864':
WifiManager: Use ConnectivityThread
Create ConnectivityThread
Paul Stewart [Tue, 22 Mar 2016 22:23:46 +0000 (22:23 +0000)]
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
WifiManager: Use ConnectivityThread
Create ConnectivityThread
Dongwon Kang [Tue, 22 Mar 2016 22:20:40 +0000 (15:20 -0700)]
MediaResourceMonitor: Change argument type from string to int
Bug:
27529962
Change-Id: I29c165ccf6b44b0ca6812f1ccae758d67b225e0d
Teng-Hui Zhu [Tue, 22 Mar 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Fix callback issue for AVD on UI thread" into nyc-dev
am:
db9fba3
* commit '
db9fba373450e01d52f14e8380646e631dee1713':
Fix callback issue for AVD on UI thread
Tenghui Zhu [Tue, 22 Mar 2016 22:10:23 +0000 (22:10 +0000)]
Merge "Fix callback issue for AVD on UI thread" into nyc-dev
Teng-Hui Zhu [Tue, 22 Mar 2016 19:56:37 +0000 (12:56 -0700)]
Fix callback issue for AVD on UI thread
We have created AnimatorSet from XML, but it is assigned to the AVD only when
we start the animation due to theme-ing operations.
Given listeners can be added to AVD at any time, we have to cache them if
AnimatorSet is not setup yet.
b/
26979225
Change-Id: I94315892de83f93a0205efe5e70dca0cd0f0a8e3
Akira Oshimi [Tue, 22 Mar 2016 21:45:04 +0000 (21:45 +0000)]
Merge "Close notification panel when user button is tapped" into nyc-dev
am:
040763d
* commit '
040763d517bccbd588b6d9af083c0c11d73646f0':
Close notification panel when user button is tapped
Adrian Roos [Tue, 22 Mar 2016 21:37:52 +0000 (21:37 +0000)]
Merge "Close notification panel when user button is tapped" into nyc-dev
Sid Soundararajan [Tue, 22 Mar 2016 21:37:45 +0000 (21:37 +0000)]
Merge "Add dismiss animation for Recents TV and Enable Dismiss" into nyc-dev
am:
6e54775
* commit '
6e54775a8d7fefe2efb8be3977234c3ecc759e8d':
Add dismiss animation for Recents TV and Enable Dismiss
Sid Soundararajan [Tue, 22 Mar 2016 21:31:47 +0000 (21:31 +0000)]
Merge "Add dismiss animation for Recents TV and Enable Dismiss" into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 21:31:48 +0000 (21:31 +0000)]
Merge "Revert "Document restricted app private file permissions"" into nyc-dev
am:
1c609e1
* commit '
1c609e1a2ebee2df080c981a8ea809f0a1e2bd3c':
Revert "Document restricted app private file permissions"
Jeff Sharkey [Tue, 22 Mar 2016 21:22:53 +0000 (21:22 +0000)]
Merge "Revert "Document restricted app private file permissions"" into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 21:22:39 +0000 (21:22 +0000)]
Revert "Document restricted app private file permissions"
This reverts commit
c83343f7ee333376d23a2bbc619d3b4e6b7a6120.
Change-Id: I08961a1cb858868e104214ce3d0aa3cfcbb054bc
smain@google.com [Tue, 22 Mar 2016 21:17:55 +0000 (14:17 -0700)]
switch offline docs back to standard templates that now have a condition for 'referenceonly'
bug:
27667787
Change-Id: Iaedba58c72634dac33ef09b9a50322af664ef581
Aga Wronska [Tue, 22 Mar 2016 21:18:43 +0000 (14:18 -0700)]
Change copy/move destination to Downloads when home directory is hidden.
Bug:
27791217
Change-Id: If196441a57053ada9875c6cc29d4c7f13fcb57e8
Andrii Kulian [Tue, 22 Mar 2016 21:09:22 +0000 (21:09 +0000)]
Merge "Revert "Refine divider behavior"" into nyc-dev
am:
cddd32f
* commit '
cddd32fc2bce2db4f604d970071462a2f755ddd7':
Revert "Refine divider behavior"
Julia Reynolds [Tue, 22 Mar 2016 21:05:56 +0000 (21:05 +0000)]
Merge "Tune visuals for inline settings" into nyc-dev
am:
196c8f7
* commit '
196c8f79353feed0c1278ace28a3959b3a08b8f1':
Tune visuals for inline settings
Andrii Kulian [Tue, 22 Mar 2016 21:04:46 +0000 (21:04 +0000)]
Merge "Revert "Refine divider behavior"" into nyc-dev
Julia Reynolds [Tue, 22 Mar 2016 20:59:46 +0000 (20:59 +0000)]
Merge "Fix Sysui crash on volume change." into nyc-dev
am:
6e9151e
* commit '
6e9151eae88035919c4af7a40a243a6410da9c16':
Fix Sysui crash on volume change.
Julia Reynolds [Tue, 22 Mar 2016 20:57:10 +0000 (20:57 +0000)]
Merge "Tune visuals for inline settings" into nyc-dev
Julia Reynolds [Tue, 22 Mar 2016 20:56:25 +0000 (20:56 +0000)]
Merge "Fix Sysui crash on volume change." into nyc-dev
Jed Estep [Tue, 22 Mar 2016 20:46:53 +0000 (20:46 +0000)]
Merge "Disable TextViewActivityMouseTest#testContextMenu" into nyc-dev
am:
e9b5fc2
* commit '
e9b5fc29dcdd91c6d955eba797ccd57abe6e772e':
Disable TextViewActivityMouseTest#testContextMenu
Jed Estep [Tue, 22 Mar 2016 20:39:08 +0000 (20:39 +0000)]
Merge "Disable TextViewActivityMouseTest#testContextMenu" into nyc-dev
Selim Cinek [Tue, 22 Mar 2016 20:10:54 +0000 (20:10 +0000)]
Merge changes Ia9502056,I97dc60c4 into nyc-dev
am:
482c7da
* commit '
482c7da6ab5a95a28ee64cb4a0365b85e8681afb':
Fixed the group expand motion to better reflect the overflow
Introduced a number indicating more children in a group
Ben Kwa [Tue, 22 Mar 2016 20:10:52 +0000 (20:10 +0000)]
Merge "DocsUI: Disable debug logging by default." into nyc-dev
am:
dcaf047
* commit '
dcaf047a418644a861345efd001c5280f71d5f52':
DocsUI: Disable debug logging by default.
Selim Cinek [Tue, 22 Mar 2016 20:04:45 +0000 (20:04 +0000)]
Merge changes Ia9502056,I97dc60c4 into nyc-dev
* changes:
Fixed the group expand motion to better reflect the overflow
Introduced a number indicating more children in a group
Julia Reynolds [Tue, 22 Mar 2016 20:03:32 +0000 (13:03 -0700)]
Fix Sysui crash on volume change.
Bug:
27765028
Change-Id: I812dcf19d497cacde9698fc61d1e1f8686460593
Ben Kwa [Tue, 22 Mar 2016 20:01:49 +0000 (20:01 +0000)]
Merge "DocsUI: Disable debug logging by default." into nyc-dev
Yohei Yukawa [Tue, 22 Mar 2016 19:54:22 +0000 (12:54 -0700)]
Explicitly handle null rather than relying on NPE.
IInputMethodManager is an actual IPC interface with which application
processes can communicate with InputMethodManagerService (IMMS).
Although this has never been a public API, it is actually exposed to the
application process hence we parameters passed to that interface methods
should be considered untrusted.
In Android L-MR1 and prior, calling IInputMethodManager#startInput()
from the application process via reflection with null EditorInfo can
result in NPE in the IME process, which is not great.
In Android M, doing that causes NPE in the IMMS process but the
exception is just sent back to the application process via Binder call,
which is no longer so harmful.
In Android N, we want to make sure that such an invalid internal API
call is clearly under our control, rather than relying on NPE, by having
an explicit null check.
Bug:
26866030
Change-Id: Ica812177d9ca454dd16e3dd6854f3053c329b344
Alex Klyubin [Tue, 22 Mar 2016 19:42:52 +0000 (19:42 +0000)]
Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev
am:
238ec1f
* commit '
238ec1f7c720d32daa9b12fcc573b51fa1be54e2':
Unbreak verifying v2 signatures of large APKs.
Paul Stewart [Tue, 22 Mar 2016 19:42:50 +0000 (19:42 +0000)]
Merge "WifiManager: Defer Async Channel init" into nyc-dev
am:
ec1e5e8
* commit '
ec1e5e80fc4d7897e17986e06bdf2e459a889827':
WifiManager: Defer Async Channel init
Alex Klyubin [Tue, 22 Mar 2016 19:40:31 +0000 (19:40 +0000)]
Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev
Jed Estep [Tue, 22 Mar 2016 18:31:05 +0000 (11:31 -0700)]
Disable TextViewActivityMouseTest#testContextMenu
This test is causing failures which are blocking other test results.
Disabled until a fix can be submitted.
Bug:
27765262
Change-Id: I459f1ab1c6d2d3119fc50166e8de0d1259801e2a
Alan Viverette [Tue, 22 Mar 2016 19:37:23 +0000 (19:37 +0000)]
Merge "Ensure that popup width and height are correct on update" into nyc-dev
am:
9e6fe19
* commit '
9e6fe190468ca83a350e2e59e4622674142d1fd4':
Ensure that popup width and height are correct on update
Paul Stewart [Tue, 22 Mar 2016 19:35:06 +0000 (19:35 +0000)]
Merge "WifiManager: Defer Async Channel init" into nyc-dev
Alan Viverette [Tue, 22 Mar 2016 19:31:26 +0000 (19:31 +0000)]
Merge "Ensure that popup width and height are correct on update" into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 18:43:02 +0000 (18:43 +0000)]
Merge "Update TrafficStats SystemApi docs." into nyc-dev
am:
c6f0d15
* commit '
c6f0d15c7d5599f2c13b586ca9c93613a099795d':
Update TrafficStats SystemApi docs.
Jeff Sharkey [Tue, 22 Mar 2016 18:43:01 +0000 (18:43 +0000)]
Merge "Throw the right exception flavor." into nyc-dev
am:
7067487
* commit '
706748782173d2f02fbbeda1310e09cd033157a3':
Throw the right exception flavor.
guoyin.chen [Tue, 22 Mar 2016 18:42:59 +0000 (18:42 +0000)]
Merge "com.android.cts.appsecurity.AdoptableHostTest may trigger below dead lock in system_server in the board with external adoptable storage as below stack:" into nyc-dev
am:
362636d
* commit '
362636da4b402fcc62401f03080d056d91e74329':
com.android.cts.appsecurity.AdoptableHostTest may trigger below dead lock in system_server in the board with external adoptable storage as below stack:
Makoto Onuki [Tue, 22 Mar 2016 18:40:06 +0000 (18:40 +0000)]
Merge "ShortcutManager: Extract helper classes." into nyc-dev
am:
6ebc08b
* commit '
6ebc08b58a2a1fc9944027969e384c9571de0766':
ShortcutManager: Extract helper classes.
Jeff Sharkey [Tue, 22 Mar 2016 18:39:50 +0000 (18:39 +0000)]
Merge "Update TrafficStats SystemApi docs." into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 18:39:37 +0000 (18:39 +0000)]
Merge "Throw the right exception flavor." into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 18:39:22 +0000 (18:39 +0000)]
Merge "com.android.cts.appsecurity.AdoptableHostTest may trigger below dead lock in system_server in the board with external adoptable storage as below stack:" into nyc-dev