OSDN Git Service
Neil Fuller [Wed, 31 Aug 2016 16:43:22 +0000 (16:43 +0000)]
Merge "Fix receive timeout on LocalSocket" am:
7a9c0cd854
am:
680ec020a1
Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7
Neil Fuller [Wed, 31 Aug 2016 16:35:24 +0000 (16:35 +0000)]
Merge "Fix receive timeout on LocalSocket"
am:
7a9c0cd854
Change-Id: I4148f467921ad6a627fe8ebc5225e2de6717270f
Neil Fuller [Wed, 31 Aug 2016 16:28:16 +0000 (16:28 +0000)]
Merge "Fix receive timeout on LocalSocket"
Sergio Giro [Wed, 31 Aug 2016 14:15:46 +0000 (14:15 +0000)]
Merge "java.security.Principal: add default method Principal#implies" am:
0c8c4a5d98
am:
e639bbd7d0
Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d
Sergio Giro [Wed, 31 Aug 2016 14:09:42 +0000 (14:09 +0000)]
Merge "java.security.Principal: add default method Principal#implies"
am:
0c8c4a5d98
Change-Id: I4708b9cee5059b588e829853264484782e251efb
Sergio Giro [Wed, 31 Aug 2016 14:04:09 +0000 (14:04 +0000)]
Merge "java.security.SecretKey: now extends from Destroyable" am:
c7bd0d0adc
am:
8a5790a287
Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145
Sergio Giro [Wed, 31 Aug 2016 13:58:11 +0000 (13:58 +0000)]
Merge "java.security.SecretKey: now extends from Destroyable"
am:
c7bd0d0adc
Change-Id: I3382bd7f225e6a487dbf4b6aa74000981f40a70e
Sergio Giro [Wed, 31 Aug 2016 13:51:37 +0000 (13:51 +0000)]
Merge "java.security.Principal: add default method Principal#implies"
Sergio Giro [Wed, 31 Aug 2016 13:50:22 +0000 (13:50 +0000)]
Merge "java.security.SecretKey: now extends from Destroyable"
Sergio Giro [Wed, 31 Aug 2016 12:42:32 +0000 (12:42 +0000)]
Merge "java.security: update java.security.KeyStore to jdk8u60" am:
d53ae2c285
am:
565c1fbf8b
Change-Id: Iec116355209c0770b4125142f93873766e29d61d
Sergio Giro [Wed, 31 Aug 2016 12:31:33 +0000 (12:31 +0000)]
Merge "java.security: update java.security.KeyStore to jdk8u60"
am:
d53ae2c285
Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d
Sergio Giro [Wed, 31 Aug 2016 12:24:48 +0000 (12:24 +0000)]
Merge "java.security: update java.security.KeyStore to jdk8u60"
Neil Fuller [Wed, 31 Aug 2016 10:32:17 +0000 (11:32 +0100)]
Fix receive timeout on LocalSocket
The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.
Test: Ran CTS test android.net.cts.LocalSocketTest
Bug:
31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
Sergio Giro [Wed, 31 Aug 2016 08:31:17 +0000 (08:31 +0000)]
Merge "java.security.cert: update classes in java.security.cert (part 2)" am:
9484bff017
am:
47f7d8384b
Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb
Sergio Giro [Wed, 31 Aug 2016 08:26:25 +0000 (08:26 +0000)]
Merge "java.security.cert: update classes in java.security.cert (part 2)"
am:
9484bff017
Change-Id: Idb12e10674a34ebfd3cf0236cc8cbde1979e5cb7
Sergio Giro [Wed, 31 Aug 2016 08:18:57 +0000 (08:18 +0000)]
Merge "java.security.cert: update classes in java.security.cert (part 2)"
Adam Seaton [Tue, 30 Aug 2016 23:39:04 +0000 (23:39 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am:
b57e6560d0
am:
e245037327
Change-Id: Ib46ce4c0e12a313f3b376634a85ae1050d655c34
Adam Seaton [Tue, 30 Aug 2016 23:15:49 +0000 (23:15 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
am:
b57e6560d0
Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f
Jason Monk [Tue, 30 Aug 2016 22:50:14 +0000 (22:50 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
am:
a845535045
Change-Id: Ib38430d968e20db46abac87c4efbb045c335d193
Jason Monk [Tue, 30 Aug 2016 22:50:10 +0000 (22:50 +0000)]
Backup system QS tiles DO NOT MERGE
am:
37bd2be160
Change-Id: I5d291b5ee504acf40386cbce4edaf5b20a1a3d3d
Chih-hung Hsieh [Tue, 30 Aug 2016 22:41:26 +0000 (22:41 +0000)]
Merge "Fix google-explicit-constructor warnings in soundpool." am:
feee33ce2c
am:
17f1fc6c76
Change-Id: If968940949e97633e99832a3edc1d3003662dac2
TreeHugger Robot [Tue, 30 Aug 2016 22:30:15 +0000 (22:30 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
Chih-hung Hsieh [Tue, 30 Aug 2016 22:29:05 +0000 (22:29 +0000)]
Merge "Fix google-explicit-constructor warnings in soundpool."
am:
feee33ce2c
Change-Id: Id3cf418900b7eb3ac2e3d94f674f4ed6f624ba27
Chih-hung Hsieh [Tue, 30 Aug 2016 22:21:34 +0000 (22:21 +0000)]
Merge "Fix google-explicit-constructor warnings in soundpool."
Adam Seaton [Tue, 30 Aug 2016 22:14:47 +0000 (22:14 +0000)]
Revert "Bump up the uncrypt timeout to 30 min."
Creates Null Build to test OTA failure fix.
This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
Change-Id: I64474dad467ce8d8e379e0e2c47814d76ac0ee0d
Chih-Hung Hsieh [Tue, 30 Aug 2016 20:42:31 +0000 (20:42 +0000)]
Merge "Fix google-explicit-constructor warnings in core/jni." am:
cfc9f5d03d
am:
ed4b31f9e1
Change-Id: Ib54027b7ecc1f3390c692b6284ecf2cd9a802da8
Chih-Hung Hsieh [Tue, 30 Aug 2016 20:37:41 +0000 (20:37 +0000)]
Merge "Fix google-explicit-constructor warnings in core/jni."
am:
cfc9f5d03d
Change-Id: Ia0378869ca5896734d5dfbdddf937b2b6dc25dbf
Treehugger Robot [Tue, 30 Aug 2016 20:30:46 +0000 (20:30 +0000)]
Merge "Fix google-explicit-constructor warnings in core/jni."
Sergio Giro [Thu, 25 Aug 2016 14:06:25 +0000 (15:06 +0100)]
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
Jason Monk [Thu, 25 Aug 2016 19:57:14 +0000 (15:57 -0400)]
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
Mark Goldstein [Tue, 30 Aug 2016 18:39:37 +0000 (18:39 +0000)]
Merge "docs: Fix broken camera example" into nyc-dev
am:
36f4638fe7
Change-Id: I93725b6c49591f174ff4863386724be865cb9715
Mark Goldstein [Tue, 30 Aug 2016 18:39:33 +0000 (18:39 +0000)]
docs: Fix broken camera example
am:
3f97bc25d4
Change-Id: Ibd8eba49bdd6d9afa850fd22c634a70d3b7d4890
Mark Goldstein [Tue, 30 Aug 2016 18:34:21 +0000 (18:34 +0000)]
Merge "docs: Fix broken camera example" into nyc-dev
Sergio Giro [Tue, 30 Aug 2016 18:26:17 +0000 (19:26 +0100)]
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
Scott Main [Tue, 30 Aug 2016 18:14:51 +0000 (18:14 +0000)]
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
smain@google.com [Tue, 30 Aug 2016 18:14:35 +0000 (18:14 +0000)]
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
Scott Main [Tue, 30 Aug 2016 18:09:03 +0000 (18:09 +0000)]
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
Sergio Giro [Tue, 30 Aug 2016 17:44:11 +0000 (18:44 +0100)]
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
Raph Levien [Tue, 30 Aug 2016 17:36:36 +0000 (17:36 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am:
5d628b1e45
Change-Id: Ib73fa8726635a0e04600edc4bf72123d57c235df
Raph Levien [Tue, 30 Aug 2016 17:36:33 +0000 (17:36 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
9cde7244b6
Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46
Raph Levien [Tue, 30 Aug 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
Neil Fuller [Tue, 30 Aug 2016 14:39:26 +0000 (14:39 +0000)]
Merge "Track libcore java.lang.reflect API changes" am:
cff3f7001c
am:
033101bb99
Change-Id: I230bfff78e929b646c044f0f362531f05e16f632
Neil Fuller [Tue, 30 Aug 2016 14:33:29 +0000 (14:33 +0000)]
Merge "Track libcore java.lang.reflect API changes"
am:
cff3f7001c
Change-Id: Ie68db07c1211f161d7757186ff5ffadd506deef6
Neil Fuller [Tue, 30 Aug 2016 14:26:34 +0000 (14:26 +0000)]
Merge "Track libcore java.lang.reflect API changes"
Neil Fuller [Mon, 22 Aug 2016 17:41:52 +0000 (18:41 +0100)]
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
Mitchell Wills [Tue, 30 Aug 2016 05:48:43 +0000 (05:48 +0000)]
DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
am:
6a80a4b05a -s ours
Change-Id: I9e559ef064ba7316578b4b511d9b1bb420c18428
Mitchell Wills [Tue, 30 Aug 2016 05:47:34 +0000 (05:47 +0000)]
DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
am:
8efb84e3e0 -s ours
Change-Id: I57c01ee74e3a4c6bdd85aacfde68ae553bc06cdf
Paul Jensen [Tue, 30 Aug 2016 05:26:28 +0000 (05:26 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am:
b9d4f91630
Change-Id: I6e3818c99daa165cfdfa662591cca46eff36ad4f
Paul Jensen [Tue, 30 Aug 2016 05:26:25 +0000 (05:26 +0000)]
Sanity check ICMP6 router advertisement packets
am:
a36213867a
Change-Id: Ic86054f2562942735e2ca7593e7f82c5108cf4a7
TreeHugger Robot [Tue, 30 Aug 2016 05:20:10 +0000 (05:20 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
Mitchell Wills [Tue, 30 Aug 2016 03:21:57 +0000 (20:21 -0700)]
DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
This reverts commit
6bc2a92a5983e971ab9a04301fe4070e5b1f9179.
Change-Id: Ie00d00d3f1649bef02abb0107e1f93445ba7a950
Mitchell Wills [Tue, 30 Aug 2016 03:21:37 +0000 (20:21 -0700)]
DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit
40f8b9251831c5f009fd476b1a3d216e126d3ef0.
Change-Id: I9a1d861277e5d32405da5815c8b4e5d616febf10
Mitchell Wills [Tue, 30 Aug 2016 03:02:50 +0000 (20:02 -0700)]
DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
This reverts commit
6bc2a92a5983e971ab9a04301fe4070e5b1f9179.
Change-Id: Ib576085fe190942891480524eb367a94a387a11c
Mitchell Wills [Tue, 30 Aug 2016 03:02:26 +0000 (20:02 -0700)]
DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit
40f8b9251831c5f009fd476b1a3d216e126d3ef0.
Change-Id: I23e8b6ac97d8853c271429fc13fbfa313717a95a
Paul Jensen [Wed, 20 Jul 2016 19:01:17 +0000 (15:01 -0400)]
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
Todd Kennedy [Tue, 30 Aug 2016 01:48:50 +0000 (01:48 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
am:
689c92db9d
Change-Id: Id7b7a97fb3abebdf27ceeeb52cfb11698610f3fb
Todd Kennedy [Tue, 30 Aug 2016 01:48:46 +0000 (01:48 +0000)]
update shared libraries for system apps
am:
85a91def5c
Change-Id: If4054abdcf13d85e2fb4f4b9086aefdf92904724
TreeHugger Robot [Tue, 30 Aug 2016 01:44:29 +0000 (01:44 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
The Android Automerger [Tue, 30 Aug 2016 00:26:21 +0000 (00:26 +0000)]
Manually merge commit '
b0b6afc' into nyc-dev-plus-aosp
John Reck [Mon, 29 Aug 2016 23:41:25 +0000 (23:41 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
am:
8eaa65b867
Change-Id: Ib41200ab378bce6c65a40364cf39c78a0b9942e9
Chris Craik [Mon, 29 Aug 2016 23:41:22 +0000 (23:41 +0000)]
Cherry pick TextureView fixes
am:
2e8a8a2432
Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
John Reck [Mon, 29 Aug 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
Mark Goldstein [Fri, 26 Aug 2016 18:29:25 +0000 (11:29 -0700)]
docs: Fix broken camera example
Removed bad out of date instructions and link to better
training pages instead.
Bug:
15562334
Change-Id: I77fe558e665de509eb11a2c668ba7bdcdbab3c6f
Todd Kennedy [Thu, 28 Jul 2016 20:28:16 +0000 (13:28 -0700)]
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
6058df65e645a81bdc7285dcd9f8b12b9f5b534f)
Yohei Yukawa [Mon, 29 Aug 2016 22:40:11 +0000 (22:40 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
am:
b7efddfc41
Change-Id: Icbef365e73d789419479143d9ce63a2476682b8e
Yohei Yukawa [Mon, 29 Aug 2016 22:40:07 +0000 (22:40 +0000)]
Make sure IME focus is synced to View focus
am:
8eb07090a4
Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
TreeHugger Robot [Mon, 29 Aug 2016 22:35:21 +0000 (22:35 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:18:55 +0000 (22:18 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am:
59fb472858
Change-Id: I257ec5926d5261fd508f91e5a60911aa752f4b48
Yuichi Biwa [Mon, 29 Aug 2016 22:18:46 +0000 (22:18 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout
am:
cb3e1237b5
Change-Id: I066aa6f03ea3c45fa1330556bc3a6db29ab48262
Chet Haase [Mon, 29 Aug 2016 22:18:34 +0000 (22:18 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am:
22e006214c
Change-Id: I8645ac4cf4cd398f74d77b62b9060a72a87a5411
Alan Viverette [Mon, 29 Aug 2016 22:18:28 +0000 (22:18 +0000)]
Set up view state before attaching, jump drawables if needed
am:
c328f042a6
Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61
Chet Haase [Mon, 29 Aug 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am:
a1bbb76806
Change-Id: I3bff93e0181b2e517a2cff6a00f9d205940f0da7
Adam Powell [Mon, 29 Aug 2016 22:18:15 +0000 (22:18 +0000)]
Force AlertDialogLayout to have gravity start|top
am:
00c4f7ba65
Change-Id: I268264e198ccb0d8394da68899406b96aaf5cb39
Chet Haase [Mon, 29 Aug 2016 22:18:11 +0000 (22:18 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am:
c80a4d7ae3
Change-Id: I72854a21958ca35bd94166fb2058f4fa38c11a87
Abodunrinwa Toki [Mon, 29 Aug 2016 22:18:07 +0000 (22:18 +0000)]
FloatingActionMode: Fix screen coordinates.
am:
99c340cad9
Change-Id: I73ff6d1b3bed01d7738634c67a6f6d1a2e755da1
Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
Christopher Tate [Mon, 29 Aug 2016 21:56:03 +0000 (21:56 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am:
2bbfe98062
Change-Id: I30577f5760dabfc39faa117a9c9f8939b9cad49d
Christopher Tate [Mon, 29 Aug 2016 21:55:53 +0000 (21:55 +0000)]
Eliminate next-alarm-clock broadcast flapping
am:
c60da1edc1
Change-Id: I011c1ca4d3d0620d2c8c41b96422568bdc5fda31
Chih-Hung Hsieh [Mon, 29 Aug 2016 21:53:50 +0000 (14:53 -0700)]
Fix google-explicit-constructor warnings in soundpool.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: Id1183b2929242cdf1fd0a1558d0e70194a1de9bb
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
Chih-Hung Hsieh [Mon, 29 Aug 2016 21:46:35 +0000 (14:46 -0700)]
Fix google-explicit-constructor warnings in core/jni.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I6125b7b761cb26831d42aabf10870ed68f0bf092
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
Cherry pick TextureView fixes
The following changes are in this commit:
Avoid destroying TextureView surfaces for onStop
bug:
30238922
TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.
Now only resources that are destroyed for onStop are DisplayLists.
(cherry picked from commit
391d560402c2902e0fd701f99eabd91025154201)
TextureView: destroy layer on destroyHardwareResources event
bug:
30468770
(cherry picked from commit
1c16c37d8646ed25e844af8472eede988ad0c2f0)
Fix NPE in TextureView
Bug:
30651595
(cherry picked from commit
3c2587f26eed32a8723488131d1d8940dc147ee1)
Fix NPE in TextureView
Bug:
30779663
(cherry picked from commit
7e237189c292cdb886733eb95c6069b7ac002527)
Fix maps resume being blank
Bug:
30889568
Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.
(cherry picked from commit
03df0834e63b587dbfb8fdcd0086e3e1e72b9f9d)
Andrii Kulian [Mon, 29 Aug 2016 21:17:02 +0000 (21:17 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am:
c8417676ed
Change-Id: Id80f837166f392e6490a09cfb22d1b748e19b5f5
Andrii Kulian [Mon, 29 Aug 2016 21:16:58 +0000 (21:16 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
am:
772c598f66
Change-Id: I6d5a62f4d19bb1043a117b4d5a085152bed45200
TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
Mitchell Wills [Mon, 29 Aug 2016 20:02:48 +0000 (20:02 +0000)]
Merge changes from topic 'wifi-aosp-master' into stage-aosp-master
* changes:
NetworkSelectionStatus: Fix copy constructor
Deprecate QNS network disable reason BAD_LINK
[NAN] API changes/fixes addressing apilint issues
[NAN] Add method to ConfigRequest to determine if non-default
[NAN] Simplify publish/subscribe configuration - merge match filters
[NAN] Udpate NAN API documentation, clean-up visibility
[NAN] Do not expose WifiManager.isNanSupported as new API
[NAN] Update finalize to check and warn user if resources not freed
[NAN] Fix bad merge use rethrowFromSystemServer
Add Log.wtf when transitionTo is used improperly
Ensure BSSIDs are correctly aged out in settings view
[NAN] Provide calling package name to service
Add WiFi toggle prompts - framework
Reenable the unit tests for StateMachine
Remove WiFi related methods from NetworkManagementService
Don't pull in external/junit through mockito
WifiConfiguration: Expose NetworkSelectionStatus strings
Add Bluetooth toggle prompts - framework
[NAN] Add LV utilities (TLV with T size of 0).
[NAN] Fix TlvElement member names - reflect public access.
TetherUtil: Use ConnectivityManager for tethering
[NAN] TLV utilities iterator - throw correct exception
[NAN] Modify arguments from "array, length" to "array"
[NAN] NAN System Api: RTT
Properly disable WiFi tethering
[NAN] Provide inteface MAC address to app.
[NAN] Add (T)LV validation testing
Add IPv6 tethering coordinator
Stop listening for WiFi interface status changes
[NAN] Add validity checks for service name
[NAN] Fix assumption about Strings containing single-byte characters.
[NAN] NAN data-path API: network specifier
DO NOT MERGE StateMachine: remove final from SendMessage
wifi: allow config of default+verbose ring buffers
Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
Add a WifiScanner API to listener for ongoing scans
Fix invitation request from persistent GC
SettingsBackupAgent: Remove redundant size parameter
WifiConfiguration: Make NetworkSelectionStatus public
Use WifiManager for wifi backup/restore
Fix race conditions between Tethering and TetherInterfaceStateMachine
WifiManager: Add new API to restore old backup data
Tethering: Own WiFi tethering state and lifetime
IpConfigStore: Changes for parsing old wifi backup
WifiManager: Add new API's for backup/restore
XmlUtils: Add missing readThisByteArrayXml method
Use an ArrayMap instead of HashMap to track tether interfaces
Consolidate cleanup logic in TetherInterfaceSM.TetheredState
Annotate TetherInterfaceStateMachineTest for APCT
Rely on Tethering mutex for TetherInterfaceSM
Rename TetherInterfaceSM to TetherInterfaceStateMachine
[NAN] Add retry count for transmitting L2 NAN messages
Remove dead code from TetherInterfaceSM
Remove transient StartingState from TetherInterfaceSM
Expand test coverage of TetherInterfaceSM
Add demonstration unittest for TetherInterfaceSM
Extract TetherInterfaceSM to its own class.
Make Tethering.TetherInterfaceSM more self contained
WifiManager: add WIFI_MODE_NO_LOCKS_HELD
Create frameworks-base-testutils lib
Clean up class members in Tethering.TetherInterfaceSM
Move android.net.util.IpUtilsTest into a util/ directory
Fix trivial warnings in Tethering.java
Fix some trivial warnings in WifiP2pDevice.java
[NAN] Add support for NAN RTT.
[NAN] Remove OnNanDown notification from API
Remove unused method from NetworkManagementService
WifiConfiguration: Add new selection disable reasons
[NAN] Add type and nullability annotations. Update hide annotation.
[NAN] Add master switch to enable/disable usage of NAN APIs.
[NAN] Re-factor connect/config flow
[NAN] Refactor session lifecycle to clarify API & eliminate race conditions
[NAN] Removed NAN event registration - dispatch all callbacks.
[NAN] Consolidate publish/subscribe callback sets into single set
[NAN] Replace session callback configuration control
[NAN] Expose match style configuration as public API.
[NAN] API cleanup - rename FLAGS.
[NAN] Renamed listeners to callback per API guidelines
[NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config
NAN: Support multiple instantiation per UID - introduce a client ID.
Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]
Eliminate next-alarm-clock broadcast flapping
When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.
Bug
29501073
Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit
76389c00d3d3ce79e48d9e87b597707ed3e8970c)
Tao Bao [Mon, 29 Aug 2016 19:33:29 +0000 (19:33 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ie634af4f18044ffaf98c21149c1635b6ad8b9a3f
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am:
8abcfed8a4
Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
Felipe Leme [Mon, 29 Aug 2016 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76
am:
bb205d5e3e
Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9
Felipe Leme [Mon, 29 Aug 2016 18:44:28 +0000 (18:44 +0000)]
Merge "Fixed statuses on Battery Saver column."
am:
21e0701f76
Change-Id: I4125ff3ad049ef2717fe12ba7ca62d99bf9bd3c5
Andrii Kulian [Mon, 29 Aug 2016 18:44:15 +0000 (18:44 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I86073e914c30743355c3dab7e6520c5a00eb5001
Andrii Kulian [Mon, 29 Aug 2016 18:44:12 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f
Change-Id: If7adc0d548380cfe397bbdd9469b818861583e0c
Felipe Leme [Mon, 29 Aug 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Fixed statuses on Battery Saver column."
Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.
Bug:
29007436
Bug:
29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit
995fa2bd2d334a37e10760c21ac108f4a3595713)
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
(cherry picked from commit
9e325706f42a1dc48abe80a24323fae4579ab033)