Commit Graph

255075 Commits

Author SHA1 Message Date
Adam Seaton
b57e6560d0 Revert "Bump up the uncrypt timeout to 30 min."
Creates Null Build to test OTA failure fix.
This reverts commit 8abcfed8a4.

Change-Id: I64474dad467ce8d8e379e0e2c47814d76ac0ee0d
2016-08-30 22:14:47 +00:00
Chih-Hung Hsieh
276322ad2e Merge "Fix google-explicit-constructor warnings in core/jni." am: cfc9f5d03d
am: ed4b31f9e1

Change-Id: Ib54027b7ecc1f3390c692b6284ecf2cd9a802da8
2016-08-30 20:42:31 +00:00
smain@google.com
dde8deb950 replace the N Preview landing page with the redirect to the package index
also update version metadata (no longer preview, now 7.0)

Change-Id: I84af003daa9bae3bc932c8b87921ed82f813e1cf
2016-08-30 20:42:12 +00:00
Chih-Hung Hsieh
ed4b31f9e1 Merge "Fix google-explicit-constructor warnings in core/jni."
am: cfc9f5d03d

Change-Id: Ia0378869ca5896734d5dfbdddf937b2b6dc25dbf
2016-08-30 20:37:41 +00:00
Treehugger Robot
cfc9f5d03d Merge "Fix google-explicit-constructor warnings in core/jni." 2016-08-30 20:30:46 +00:00
Mark Lu
59640a9f1c docs: improve docs for sqlite package summary
- Update the sqlite version info
- Describe how to get sqlite version info
- Remove reference to out-of-date Notepad sample
- Update sqlite3 folder location and add link to relevant documentation

Bug: 30833403
Bug: 17393931
Change-Id: Ic58e88a119919f43ed90a70c559da8eacef4ebe0
2016-08-30 13:15:55 -07:00
Sergio Giro
71b95041d6 java.security: update java.security.KeyStore to jdk8u60
Pulling upstream changes from OpenJDK version jdk8u60 for
java.security.KeyStore.

- New method getAttributes in KeyStore.Entry
- New interface Attribute in KeyStore.Entry
- New constructor specifying protection algorithm and protection parameters in
KeyStore.PasswordProtection.
- New getters for protection algorithm and protection parameters in
KeyStore.PasswordProtection
- In PrivateKeyEntry, SecretKeyEntry and TrustedCertificateEntry, new
constructor allowing to specify attributes, and corresponding getter
getAttributes.

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.

This completes the port to jdk8u60 for this class.

Change-Id: Ifec9d07b8f6c367a6fa2672fd5c43747057336ad
Test: make droid docs, vogar KS*{Entry,Password}*.java
Bug: 29631070
2016-08-30 19:57:43 +00:00
Jason Monk
37bd2be160 Backup system QS tiles DO NOT MERGE
Add QS tiles to the backup list.  Non-system tiles will get removed
since they won't be installed when restore happens.

Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938
2016-08-30 15:48:15 -04:00
Andrew Solovay
7cfe9f83ac docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
See first comment for doc stage location.

bug: 31181353
Change-Id: Ibdd8c32be4b182241a4b2d3b4f430dbca18c53fb
2016-08-30 12:45:06 -07:00
Mark Goldstein
b213e0cedb Merge "docs: Fix broken camera example" into nyc-dev
am: 36f4638fe7

Change-Id: I93725b6c49591f174ff4863386724be865cb9715
2016-08-30 18:39:37 +00:00
Mark Goldstein
d06a603bcf docs: Fix broken camera example
am: 3f97bc25d4

Change-Id: Ibd8eba49bdd6d9afa850fd22c634a70d3b7d4890
2016-08-30 18:39:33 +00:00
Mark Goldstein
36f4638fe7 Merge "docs: Fix broken camera example" into nyc-dev 2016-08-30 18:34:24 +00:00
Sergio Giro
6f285fa91e java.security.Principal: add default method Principal#implies
Given a Subject, Principal#implies returns true iff the principal
is one of the subject's principals.

Bug: 29631070
Test: make droid docs, vogar PrincipalTest.java
Change-Id: Ic24ca4bc26e29abdb67481af8255b8b1683a6f3a
2016-08-30 19:26:17 +01:00
Scott Main
a7373b08b9 Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev
am: 4d1f3047e3

Change-Id: I9c32106d2eef0a01de0a4f309a14d22eb11f7c48
2016-08-30 18:14:51 +00:00
smain@google.com
cbfe7475d8 add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748
am: 99e44c903c

Change-Id: I5f13d93bba2dd6a43bde836842243e0f70e5a501
2016-08-30 18:14:35 +00:00
Scott Main
4d1f3047e3 Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev 2016-08-30 18:09:06 +00:00
Sergio Giro
7cdfa7499a java.security.SecretKey: now extends from Destroyable
Also:
- added comments
- replace <code> by @code tags

This completes the port of SecretKey to jdk8u60.

Bug: 29631070
Test: make droid docs
Change-Id: Id3604c1e62855d9fa9bf02a704c79c6d2131b006
2016-08-30 18:44:11 +01:00
Raph Levien
dae4b8b2a8 Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am: 5d628b1e45

Change-Id: Ib73fa8726635a0e04600edc4bf72123d57c235df
2016-08-30 17:36:36 +00:00
Raph Levien
84c45e7085 Enforce consistent sizes for arrays in SpannableStringInternal
am: 9cde7244b6

Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46
2016-08-30 17:36:33 +00:00
Raph Levien
5d628b1e45 Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev 2016-08-30 17:25:58 +00:00
Neil Fuller
671d9ce289 Track exposure of new j.l.reflect methods
Modifier.parameterModifiers() and Class.toGenericString().

Bug: 28666126
Change-Id: Idd230540e15aa5c298739a7ba72ed3e47159d037
2016-08-30 15:51:07 +01:00
Neil Fuller
c1d52a634c Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c
am: 033101bb99

Change-Id: I230bfff78e929b646c044f0f362531f05e16f632
2016-08-30 14:39:26 +00:00
Neil Fuller
033101bb99 Merge "Track libcore java.lang.reflect API changes"
am: cff3f7001c

Change-Id: Ie68db07c1211f161d7757186ff5ffadd506deef6
2016-08-30 14:33:29 +00:00
Neil Fuller
cff3f7001c Merge "Track libcore java.lang.reflect API changes" 2016-08-30 14:26:34 +00:00
Neil Fuller
2cc1eed174 Track libcore java.lang.reflect API changes
The modifications to Class / Field affect the .txt file
for no good reason: the use of a different generic
variable name results in changes because the tools think
methods have been added / removed when they haven't.

The only interface change from upstream included is adding
"extends AnnotatedElement" to GenericDeclaration. All (platform)
subclasses already did implement this interface. App classes may
be affected but only if they do not currently implement those
methods and they are somehow called.

Bug: 28666126
Test: cts ran for libcore (libcore, harmony_java_lang, org)
Change-Id: Ice5afb80834d7f7a4d23dade21a1590c6b323ed8
2016-08-30 12:08:10 +01:00
Mitchell Wills
34c16ededb DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
am: 6a80a4b05a  -s ours

Change-Id: I9e559ef064ba7316578b4b511d9b1bb420c18428
2016-08-30 05:48:43 +00:00
Mitchell Wills
321b239f06 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
am: 8efb84e3e0  -s ours

Change-Id: I57c01ee74e3a4c6bdd85aacfde68ae553bc06cdf
2016-08-30 05:47:34 +00:00
Paul Jensen
f17321066a Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am: b9d4f91630

Change-Id: I6e3818c99daa165cfdfa662591cca46eff36ad4f
2016-08-30 05:26:28 +00:00
Paul Jensen
504e737132 Sanity check ICMP6 router advertisement packets
am: a36213867a

Change-Id: Ic86054f2562942735e2ca7593e7f82c5108cf4a7
2016-08-30 05:26:25 +00:00
TreeHugger Robot
b9d4f91630 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev 2016-08-30 05:20:12 +00:00
Mitchell Wills
accde60f09 DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
This reverts commit 6bc2a92a59.

Change-Id: Ie00d00d3f1649bef02abb0107e1f93445ba7a950
2016-08-29 20:22:08 -07:00
Mitchell Wills
e0d09999e9 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b92518.

Change-Id: I9a1d861277e5d32405da5815c8b4e5d616febf10
2016-08-29 20:21:42 -07:00
Mitchell Wills
6a80a4b05a DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
This reverts commit 6bc2a92a59.

Change-Id: Ib576085fe190942891480524eb367a94a387a11c
2016-08-29 20:15:59 -07:00
Mitchell Wills
8efb84e3e0 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b92518.

Change-Id: I23e8b6ac97d8853c271429fc13fbfa313717a95a
2016-08-29 20:15:48 -07:00
Kevin Hufnagle
6a399a26ae docs: Changed Android branding guidelines for clarity
Specified that product names cannot include names or terms that are
confusingly similar to Android and that Android as an adjective
cannot describe a developer's product, app, or service.

Bug: 17607532
Change-Id: Ic191a2d7573e6fe266e7f3beb0c8e2975eb1ea3c
2016-08-29 19:54:51 -07:00
Paul Jensen
a36213867a Sanity check ICMP6 router advertisement packets
There is a chance a packet can slip by before we install the filter
on our socket listening for RAs, so add some basic sanity checking
to make sure we've recieved an RA.

Change-Id: I14cf84a0814896a41e00f50af376dfc4988d36cb
Fixes: 29586253
2016-08-30 10:57:30 +09:00
Todd Kennedy
30a8917720 Merge "update shared libraries for system apps" into nyc-dev
am: 689c92db9d

Change-Id: Id7b7a97fb3abebdf27ceeeb52cfb11698610f3fb
2016-08-30 01:48:50 +00:00
Todd Kennedy
caf42418f6 update shared libraries for system apps
am: 85a91def5c

Change-Id: If4054abdcf13d85e2fb4f4b9086aefdf92904724
2016-08-30 01:48:46 +00:00
TreeHugger Robot
689c92db9d Merge "update shared libraries for system apps" into nyc-dev 2016-08-30 01:44:31 +00:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Kevin Hufnagle
5add769f59 docs: Adjusted return value desc. for getApplicationEnabledSetting
The return value now references ApplicationInfo instead of
ComponentInfo.

Bug: 18123642
Change-Id: I595befe62dbce997becb689362abe5e4483b82c4
2016-08-29 16:50:17 -07:00
John Reck
8f0de55375 Merge "Cherry pick TextureView fixes" into nyc-dev
am: 8eaa65b867

Change-Id: Ib41200ab378bce6c65a40364cf39c78a0b9942e9
2016-08-29 23:41:25 +00:00
Chris Craik
dbf69818a2 Cherry pick TextureView fixes
am: 2e8a8a2432

Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
2016-08-29 23:41:22 +00:00
John Reck
8eaa65b867 Merge "Cherry pick TextureView fixes" into nyc-dev 2016-08-29 23:33:57 +00:00
Mark Goldstein
3f97bc25d4 docs: Fix broken camera example
Removed bad out of date instructions and link to better
training pages instead.

Bug: 15562334
Change-Id: I77fe558e665de509eb11a2c668ba7bdcdbab3c6f
2016-08-29 15:55:31 -07:00
Todd Kennedy
85a91def5c update shared libraries for system apps
After removing updates for a system package, we weren't updating its
shared libraries when we should have. Make it so.

NOTE: This didn't affect device boot because we update all of the
shared libraries for all system applications after scanning packages.

Bug: 30266503
Change-Id: I8edf4344228fb3e793e7648ea70a041cb5db6af6
(cherry picked from commit 6058df65e6)
2016-08-29 22:50:49 +00:00
Yohei Yukawa
438c37a1dc Merge "Make sure IME focus is synced to View focus" into nyc-dev
am: b7efddfc41

Change-Id: Icbef365e73d789419479143d9ce63a2476682b8e
2016-08-29 22:40:11 +00:00
Yohei Yukawa
87b9a88c32 Make sure IME focus is synced to View focus
am: 8eb07090a4

Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
2016-08-29 22:40:07 +00:00
TreeHugger Robot
b7efddfc41 Merge "Make sure IME focus is synced to View focus" into nyc-dev 2016-08-29 22:35:23 +00:00
Chet Haase
db7f35fed6 Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am: 59fb472858

Change-Id: I257ec5926d5261fd508f91e5a60911aa752f4b48
2016-08-29 22:18:55 +00:00