Hugo Benichi
56f1281888
Network Switching Notifications: add unit tests
...
am: a43a095106
Change-Id: I940870a6df6a8f57966a52535ed22ec8123fb27d
2016-08-30 20:16:57 +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
Pankaj Kanwar
aa8263d85d
Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev
...
* changes:
Network switch notifications: rate & daily limits
Network Switching Notifications: add unit tests
2016-08-30 20:11:11 +00:00
Makoto Onuki
e58471e7e8
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
...
am: 9480c98ddf
Change-Id: If0820595b9695f1771c5c6b9ad52689d428447f5
2016-08-30 20:01:35 +00:00
Makoto Onuki
fda26f6ffb
Backport shortcut manager test utilities to DR
...
am: 0a15cd4ba0
Change-Id: I6e9f7a0399b3fe5a9e340770ec9a28df001f084f
2016-08-30 20:01:32 +00:00
Makoto Onuki
dec5726c43
Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev
2016-08-30 19:57:36 +00:00
Makoto Onuki
9480c98ddf
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
2016-08-30 19:54:56 +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
393bd2e87a
Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7
...
am: 92028aeb79
Change-Id: I5753e2e34f7f1250e4b115f3e9d15b0e19c1f1e6
2016-08-30 18:45:23 +00:00
Mark Goldstein
18b1be0deb
docs: Fix broken camera example am: 3f97bc25d4
...
am: 3dbf596090
Change-Id: Ice0817f1e83268a3d2877de380e1185b9255654c
2016-08-30 18:45:20 +00:00
Mark Goldstein
92028aeb79
Merge "docs: Fix broken camera example" into nyc-dev
...
am: 36f4638fe7
Change-Id: Id8a885af6c0f9887e6aaa82f662c264c86ba9791
2016-08-30 18:39:27 +00:00
Mark Goldstein
3dbf596090
docs: Fix broken camera example
...
am: 3f97bc25d4
Change-Id: I80f79eab0f11185f671bad1b57766f6fcf874464
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
Narayan Kamath
3764a260f0
Add a whitelist of sockets on fork.
...
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug: 30963384
Change-Id: Ie04dac62d0e0f29354df9ac15af217ad652ffbbe
2016-08-30 19:20:45 +01: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
Change-Id: Idd33d16101bcfea96a4be0ee1ac131aef2df9065
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
Change-Id: I084cb46d63ebdab7ee2286024bfc3b1962b3bad5
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
Change-Id: Ia0ba032f2035d2fcd326c658e348cf2d0fbdeed9
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
Change-Id: I6f407f90b8e53849a6d1c0ed70adb1ca8c90234f
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
Change-Id: I8d4783f155334b5c681765b12b0f59c3e30a8bd5
2016-08-30 17:44:09 +00:00
Raph Levien
a2173f8154
Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6
...
am: 75152d61b0
Change-Id: I7b82b8367671de55fb0e1000869704dbbec843e4
2016-08-30 17:44:04 +00:00
Raph Levien
3a25ff9402
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
...
am: 5d628b1e45
Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7
2016-08-30 17:33:35 +00:00
Raph Levien
75152d61b0
Enforce consistent sizes for arrays in SpannableStringInternal
...
am: 9cde7244b6
Change-Id: I461863c5a4dad8f050b14f55d14020ab1a0874f7
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
84e6f1232c
Network switch notifications: rate & daily limits
...
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.
It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.
Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
2016-08-31 00:36:11 +09:00
Hugo Benichi
a43a095106
Network Switching Notifications: add unit tests
...
BUG: 31132499
Change-Id: I9c50a59fe48efdcb51d2517f0a756691700c3ebe
2016-08-31 00:35:16 +09:00
Lorenzo Colitti
bad422e647
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
...
am: f45f9d31d3
Change-Id: Ic6ab6d1048a89c12b44c6c33e77c8ead7f641575
2016-08-30 10:51:21 +00:00
Lorenzo Colitti
b301283d57
Don't notify on network switch if source network is validated.
...
am: c2e10bb074
Change-Id: I85fdb0faf48a54ab63b5b23f1e992bc5e9116194
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
Change-Id: I0a347072ac9dc32013b41209ba6966d6ff4d26a2
2016-08-30 05:47:36 +00:00
Paul Jensen
008c82c10b
Sanity check ICMP6 router advertisement packets am: a36213867a -s ours
...
am: e39980689e
Change-Id: I2a18188cb1b8a1c3fe26c41eea72f4c3cc03a369
2016-08-30 05:47:33 +00:00
Paul Jensen
79ecffe719
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
...
am: b9d4f91630
Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b
2016-08-30 05:44:34 +00:00
Paul Jensen
e39980689e
Sanity check ICMP6 router advertisement packets
...
am: a36213867a -s ours
Change-Id: I8371809758391158effb378fae4b6fc9aaca553c
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
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
Erik Kline
ee5de9d245
Remove INetd AIDL reference
...
Change-Id: I29dfee480a4706213b36766724b6211dbc74dbac
2016-08-30 11:40:20 +09:00
Svetoslav Ganov
fe2462f3a6
Properly close fd backing a MemoryIntArray
...
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.
Bug:30310689
Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
2016-08-30 02:26:19 +00:00
Todd Kennedy
92b70b4b07
Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d
...
am: 69b47a2010
Change-Id: I73da3e3a7ffe88f69e9af28d65e5d695ffc1a1bb
2016-08-30 01:57:48 +00:00
Todd Kennedy
8da2996820
update shared libraries for system apps am: 85a91def5c
...
am: 7c23d3f837
Change-Id: Idcd5040fbabafb79a7f847514d7d808a336109a9
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
Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3
2016-08-30 01:48:47 +00:00
Todd Kennedy
7c23d3f837
update shared libraries for system apps
...
am: 85a91def5c
Change-Id: Iea6f0e3809bc5e4c77a1d5d83be67d6c285bea65
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