Pankaj Kanwar
f56bf7eae3
Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev am: aa8263d85d
...
am: a32e7e9089
2016-08-30 20:25:06 +00:00
Lorenzo Colitti
2c535a4f7c
Network switch notifications: rate & daily limits am: 84e6f1232c
...
am: 858499b2c0
2016-08-30 20:24:14 +00:00
Hugo Benichi
cf5f5785c9
Network Switching Notifications: add unit tests am: a43a095106
...
am: 56f1281888
2016-08-30 20:23:01 +00:00
Pankaj Kanwar
a32e7e9089
Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev
...
am: aa8263d85d
2016-08-30 20:17:39 +00:00
Lorenzo Colitti
858499b2c0
Network switch notifications: rate & daily limits
...
am: 84e6f1232c
2016-08-30 20:17:33 +00:00
Hugo Benichi
56f1281888
Network Switching Notifications: add unit tests
...
am: a43a095106
2016-08-30 20:16:57 +00:00
Makoto Onuki
7121484984
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98ddf
...
am: e58471e7e8
2016-08-30 20:11:13 +00: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
54541310a5
Backport shortcut manager test utilities to DR am: 0a15cd4ba0
...
am: fda26f6ffb
2016-08-30 20:10:44 +00:00
Makoto Onuki
a4e4ab809d
Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev
...
am: dec5726c43
2016-08-30 20:02:35 +00:00
Makoto Onuki
27b36f4789
Shortcut: Improve backup & restore
...
am: fc4cf2da34
2016-08-30 20:02:31 +00:00
Makoto Onuki
e58471e7e8
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
...
am: 9480c98ddf
2016-08-30 20:01:35 +00:00
Makoto Onuki
fda26f6ffb
Backport shortcut manager test utilities to DR
...
am: 0a15cd4ba0
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
Mark Goldstein
d4ed3c0d51
Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7 am: 92028aeb79
...
am: 393bd2e87a
2016-08-30 18:51:00 +00:00
Mark Goldstein
ec518d6f0e
docs: Fix broken camera example am: 3f97bc25d4 am: 3dbf596090
...
am: 18b1be0deb
2016-08-30 18:50:56 +00:00
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
8eec8f6123
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
...
am: b6022a2748
2016-08-30 18:24:56 +00:00
smain@google.com
8ea970f59c
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
...
am: c731669507
2016-08-30 18:24:54 +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
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
26fa6328b8
Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev
...
am: 65ce524bde
2016-08-30 17:59:17 +00:00
Sudheer Shanka
0be41fc1a9
Allow apps with CREATE_USERS permission to create demo users.
...
am: 234d1afd79
2016-08-30 17:59:15 +00:00
Raph Levien
ae0326774b
Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402" into nyc-mr1-dev
...
am: 5d2fbd78de
2016-08-30 17:50:33 +00:00
Raph Levien
bd5fb1fd4f
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402
...
am: bd0fea6ef6
2016-08-30 17:50:31 +00:00
Raph Levien
15d09ad4ee
Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev
...
am: bc6425f838
2016-08-30 17:50:25 +00:00
Raph Levien
8e02f356d2
Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0
...
am: a2173f8154
2016-08-30 17:50:22 +00:00
Eino-Ville Talvala
033defa1a0
Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
...
am: 0656931d18
2016-08-30 17:50:16 +00:00
Eino-Ville Talvala
286b1a83e4
android.view.Surface: Add parceling warning
...
am: f005f5ed88
2016-08-30 17:50:12 +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
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
