Mark Goldstein
393bd2e87a
Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7
...
am: 92028aeb79
2016-08-30 18:45:23 +00:00
Mark Goldstein
18b1be0deb
docs: Fix broken camera example am: 3f97bc25d4
...
am: 3dbf596090
2016-08-30 18:45:20 +00:00
Mark Goldstein
92028aeb79
Merge "docs: Fix broken camera example" into nyc-dev
...
am: 36f4638fe7
2016-08-30 18:39:27 +00:00
Mark Goldstein
3dbf596090
docs: Fix broken camera example
...
am: 3f97bc25d4
2016-08-30 18:39:24 +00:00
Mark Goldstein
36f4638fe7
Merge "docs: Fix broken camera example" into nyc-dev
2016-08-30 18:34:24 +00:00
Scott Main
b6022a2748
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
...
am: 254890a98c
2016-08-30 18:19:21 +00:00
smain@google.com
c731669507
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
...
am: 939c23d05a
2016-08-30 18:19:19 +00:00
Scott Main
254890a98c
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
2016-08-30 18:14:17 +00:00
smain@google.com
939c23d05a
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
2016-08-30 18:14:12 +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
Sudheer Shanka
65ce524bde
Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev
2016-08-30 17:46:15 +00:00
Android Build Merger (Role)
5d2fbd78de
Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402" into nyc-mr1-dev
2016-08-30 17:44:50 +00:00
Android Build Merger (Role)
bc6425f838
Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev
2016-08-30 17:44:38 +00:00
Eino-Ville Talvala
0656931d18
Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
2016-08-30 17:44:11 +00:00
Raph Levien
bd0fea6ef6
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45
...
am: 3a25ff9402
2016-08-30 17:44:09 +00:00
Raph Levien
a2173f8154
Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6
...
am: 75152d61b0
2016-08-30 17:44:04 +00:00
Raph Levien
3a25ff9402
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
...
am: 5d628b1e45
2016-08-30 17:33:35 +00:00
Raph Levien
75152d61b0
Enforce consistent sizes for arrays in SpannableStringInternal
...
am: 9cde7244b6
2016-08-30 17:33: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
Lorenzo Colitti
bad422e647
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
...
am: f45f9d31d3
2016-08-30 10:51:21 +00:00
Lorenzo Colitti
b301283d57
Don't notify on network switch if source network is validated.
...
am: c2e10bb074
2016-08-30 10:51:19 +00:00
TreeHugger Robot
f45f9d31d3
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
2016-08-30 10:46:33 +00:00
TreeHugger Robot
0a272fcba7
Merge "Remove INetd AIDL reference" into nyc-mr1-dev
2016-08-30 07:09:30 +00:00
Paul Jensen
d522a6f630
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630
...
am: 79ecffe719
2016-08-30 05:47:36 +00:00
Paul Jensen
008c82c10b
Sanity check ICMP6 router advertisement packets am: a36213867a -s ours
...
am: e39980689e
2016-08-30 05:47:33 +00:00
Paul Jensen
79ecffe719
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
...
am: b9d4f91630
2016-08-30 05:44:34 +00:00
Paul Jensen
e39980689e
Sanity check ICMP6 router advertisement packets
...
am: a36213867a
2016-08-30 05:42:04 +00:00
TreeHugger Robot
b9d4f91630
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
2016-08-30 05:20:12 +00:00
Pat Tjin
6c0d81520b
Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev
2016-08-30 05:18:35 +00:00
Erik Kline
ee5de9d245
Remove INetd AIDL reference
...
Change-Id: I29dfee480a4706213b36766724b6211dbc74dbac
2016-08-30 11:40:20 +09:00
Todd Kennedy
92b70b4b07
Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d
...
am: 69b47a2010
2016-08-30 01:57:48 +00:00
Todd Kennedy
8da2996820
update shared libraries for system apps am: 85a91def5c
...
am: 7c23d3f837
2016-08-30 01:57:46 +00: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
69b47a2010
Merge "update shared libraries for system apps" into nyc-dev
...
am: 689c92db9d
2016-08-30 01:48:47 +00:00
Todd Kennedy
7c23d3f837
update shared libraries for system apps
...
am: 85a91def5c
2016-08-30 01:48:45 +00:00
TreeHugger Robot
689c92db9d
Merge "update shared libraries for system apps" into nyc-dev
2016-08-30 01:44:31 +00:00
Eino-Ville Talvala
f005f5ed88
android.view.Surface: Add parceling warning
...
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.
Add a warning to avoid issues in the future
Bug: 31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
2016-08-29 17:51:23 -07:00
TreeHugger Robot
92a8a4a6e2
Merge "Add animation when unoccluding windows (1/2)" into nyc-mr1-dev
2016-08-30 00:20:41 +00:00
John Reck
24a082cd49
Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867
...
am: 25c6b37613
2016-08-29 23:53:24 +00:00
Chris Craik
2e5e9feaef
Cherry pick TextureView fixes am: 2e8a8a2432
...
am: 05cb60846c
2016-08-29 23:53:22 +00:00
John Reck
25c6b37613
Merge "Cherry pick TextureView fixes" into nyc-dev
...
am: 8eaa65b867
2016-08-29 23:41:44 +00:00
Chris Craik
05cb60846c
Cherry pick TextureView fixes
...
am: 2e8a8a2432
2016-08-29 23:41:42 +00:00
Pankaj Kanwar
8a4db04893
Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev
2016-08-29 23:35:11 +00:00
John Reck
8eaa65b867
Merge "Cherry pick TextureView fixes" into nyc-dev
2016-08-29 23:33:57 +00:00
TreeHugger Robot
23f6f13eab
Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev
2016-08-29 23:14:26 +00:00
Yohei Yukawa
04e7bc8ea4
Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41
...
am: 15946bd93c
2016-08-29 23:00:05 +00:00
Yohei Yukawa
74e5244fde
Make sure IME focus is synced to View focus am: 8eb07090a4 -s ours
...
am: ef53c0f5ec
2016-08-29 23:00:02 +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
TreeHugger Robot
cd97d925c0
Merge "Push delete notification when Bug reports are deleted." into nyc-mr1-dev
2016-08-29 22:55:27 +00: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
