244243 Commits

Author SHA1 Message Date
Alex Klyubin
29045203f3 Use correct cert chain from PKCS#7 SignedData block.
This fixes a bug where APK JAR signature verifier returned the wrong
certificate chain. Rather than returning the cert chain of the
verified SignerInfo, it was returning the bag of certs of the PKCS#7
SignedData block.

This issue was introduced in Android N and thus does not affect
earlier Android platform versions.

Bug: 29055836
Change-Id: I684c0f8e9ff47b922030645e07b6a114c0eb0963
2016-05-31 16:10:00 -07:00
Todd Kennedy
1c39a112b4 Merge "Remove STOPSHIP" into nyc-dev 2016-05-31 21:07:34 +00:00
Adrian Roos
ac2b44f502 Merge "Fix crash with intent-less actions" into nyc-dev 2016-05-31 20:51:50 +00:00
Jorim Jaggi
0c54d2c391 Merge "Fix multi-window enter animation" into nyc-dev 2016-05-31 20:08:50 +00:00
Selim Cinek
ddc6de1eda Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev 2016-05-31 19:26:16 +00:00
Yigit Boyar
bb039d2f17 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev 2016-05-31 19:20:21 +00:00
sreevanis
9801a9269c Updated image sizes and wrapped text around images. am: 1ce2279423
am: 2cbac3c122

* commit '2cbac3c122e1114f72ef44c3e62c8ec7c372db94':
  Updated image sizes and wrapped text around images.

Change-Id: Ie0df8af83058bf81a71f6fb75cb71b453ad9f47e
2016-05-31 18:45:36 +00:00
sreevanis
2cbac3c122 Updated image sizes and wrapped text around images.
am: 1ce2279423

* commit '1ce2279423a544d431bf6b64f2bfeb1a4617120b':
  Updated image sizes and wrapped text around images.

Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
2016-05-31 18:39:38 +00:00
Chris Tate
87ad1fce25 Merge "Build JobStatus objects outside the lock" into nyc-dev 2016-05-31 18:36:49 +00:00
sreevanis
1ce2279423 Updated image sizes and wrapped text around images.
Fixed messagingstyle link in api-overview page.

Bug:28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
2016-05-31 10:55:13 -07:00
Hall Liu
8b655e0f57 Merge "Disable app pinning when emergency call button pressed" into nyc-dev 2016-05-31 17:29:37 +00:00
Ricky Wai
21f98459b7 Merge "Do not get device owner admin info when device owner is null" into nyc-dev 2016-05-31 17:22:55 +00:00
Dan Yu
24d5e1b9ec Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c
am: 2ad3221e5f

* commit '2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
2016-05-31 17:21:48 +00:00
Daniel Yu
2ad3221e5f Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs
am: 160ce9413c

* commit '160ce9413ccd5cef62b01f2e7e7fb601c5e8fbf2':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I646cb0a2e9ecc0f783444bb8b63334a37c6e22df
2016-05-31 17:17:18 +00:00
Dan Yu
160ce9413c Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 2016-05-31 17:09:24 +00:00
Ricky Wai
90c9dbc919 Do not get device owner admin info when device owner is null
Bug: 29043723
Change-Id: I355c549f891a5e71f654f42ed16a7139da86482a
2016-05-31 18:01:46 +01:00
TreeHugger Robot
ce289e937e Merge "Look at last used app when filtering." into nyc-dev 2016-05-31 11:29:41 +00:00
TreeHugger Robot
89f4bff149 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 2016-05-31 11:23:44 +00:00
Nicolas Geoffray
fa78b219b7 Look at last used app when filtering.
In order to cover cases where a device hasn't been used
for a while.

bug:28969280
Change-Id: I897e833ed83912b848f25a7a81fe59f0ee655be1
2016-05-31 11:13:51 +01:00
Victor Chang
98801e9f2b Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 2016-05-31 09:43:37 +00:00
Victor Chang
76609106b7 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 2016-05-31 08:21:24 +00:00
Victor Chang
aa2e02348a Finish ConfirmDialog when another vpn app is always-on
Bug:29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
2016-05-31 09:11:19 +01:00
TreeHugger Robot
e71cdef7e3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:54:31 +00:00
TreeHugger Robot
ae284e6cb6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:46:00 +00:00
TreeHugger Robot
5854f2aa07 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-31 03:45:44 +00:00
Bill Yi
f03166100c Import translations. DO NOT MERGE
Change-Id: I55d645f1ec4661ef1db9a650aa555178fc6ed6a5
Auto-generated-cl: translation import
2016-05-30 18:11:25 -07:00
Roozbeh Pournader
fe524c0e24 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 2016-05-31 01:02:42 +00:00
Bill Yi
95c8a941af Import translations. DO NOT MERGE
Change-Id: Ieeea0ff0eefd470b6a929f69671ca10724990c88
Auto-generated-cl: translation import
2016-05-30 17:49:58 -07:00
Bill Yi
650a11a2dd Import translations. DO NOT MERGE
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
2016-05-30 11:53:22 -07:00
Victor Chang
98a633a89c Fix VPN Request dialog appearing each time VPN is connecting
cause: ConfirmDialog is shown when prepareVpn(package, null)
returns false when the package is in always-on mode

We added the code in ag/949136 to stop app replacing app currently set to always-on.

Bug: 28941235
Change-Id: I370e56ad59332cc3fb722a98730fa73a97e26831
2016-05-30 18:35:08 +01:00
Hemal Patel
747d945b2c Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8
am: 71b5005a66

* commit '71b5005a66872c25aaf71be865246294d0888279':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b
2016-05-28 01:24:52 +00:00
Hemal Patel
71b5005a66 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs
am: 709f0df0d8

* commit '709f0df0d883ee5351d4f5688360fa76f9a84dbc':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8
2016-05-28 01:20:26 +00:00
Hemal Patel
709f0df0d8 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 2016-05-28 01:16:51 +00:00
Jorim Jaggi
be2527b964 Merge "Replace Log.wtf by Log.e" into nyc-dev 2016-05-28 01:03:28 +00:00
Chris Tate
b182735757 Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev 2016-05-28 00:52:11 +00:00
Jorim Jaggi
25f332ca19 Replace Log.wtf by Log.e
Bug: 28949995
Change-Id: I2193511566124980860843da0a822621184218b1
2016-05-27 17:47:14 -07:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
2016-05-27 17:13:10 -07:00
Winson Chung
8a9100caae Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev 2016-05-28 00:07:47 +00:00
Selim Cinek
ddf1b399d8 Fixed a few accessibility issues with notifications and groups
Change-Id: I78fa62884eaa0efe825b5eb1e6cac7d88fc05a7f
Fixes: 28069681
2016-05-27 17:04:56 -07:00
Jorim Jaggi
e525a35704 Fix multi-window enter animation
Stable insets are not calculated in the first pass, so fetch it
manually if needed to avoid a relayout.

Bug: 28705801
Change-Id: I8f9a3bab96b597a80963d7ebcc8b19454b3e45a6
2016-05-27 23:58:20 +00:00
TreeHugger Robot
f97a0f5c9c Merge "Add more doc for Object animators defined with a single value" into nyc-dev 2016-05-27 23:51:18 +00:00
smain@google.com
c26b8afd35 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51
am: 3152ead0f8

* commit '3152ead0f8cb5994100a423b47907db06d8e0d7b':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I8ec4aee36c2f39f9590fe94ffa8fa7b8da90cf43
2016-05-27 23:02:25 +00:00
Yigit Boyar
51b5caf902 Invalidate child bounds when AbsListView bounds change
This CL fixes a bug in AbsListView where it was not invalidating
children's bounds when AbsListView's bounds change. This was
triggering bugs where if you set padding on a list view, it would
not resize its children.

Bug: 28800232
Change-Id: I81a4e9ea234c395de80efea5ef5e47a71cb95136
2016-05-27 16:00:22 -07:00
smain@google.com
3152ead0f8 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890
am: d6c76ddc51

* commit 'd6c76ddc51a1b607c50d8e443a7affb9b2e0e1b6':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia14317cc6a292fcda6328d96660db0eda5757e12
2016-05-27 22:56:53 +00:00
Adrian Roos
e3e80bde12 Merge "Fix status bar autohide with DirectReply" into nyc-dev 2016-05-27 22:55:00 +00:00
smain@google.com
d6c76ddc51 redirect adt guide to release notes to consolidate the deprecation message.
related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia9b533ec52a0fd05fcfeede04dda64ae6041c6a2
2016-05-27 15:48:44 -07:00
Android Build Merger (Role)
ddb8133841 Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev 2016-05-27 22:46:28 +00:00
Joe Fernandez
3ccb88b97a Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90
am: 25967b7577

* commit '25967b7577b427b81417848678dad3916b92d6ba':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I383c15867a5a0334b856bedf27ccb93f464a9751
2016-05-27 22:46:01 +00:00
TreeHugger Robot
49b515a2a5 Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev 2016-05-27 22:44:19 +00:00
Adrian Roos
2608cc891d Fix crash with intent-less actions
Follow-up to I00d46036a2cbb73f7f733fd35bf0b743a02807a1

Bug: 28818704
Change-Id: I9a444b9dd4cea92b4a770d7051c05c48818892ad
2016-05-27 15:36:30 -07:00