Commit Graph

249922 Commits

Author SHA1 Message Date
TreeHugger Robot
562ea5ceb5 Merge "Don't notify windows of resize during PIP animation." into nyc-dev 2016-05-12 19:35:25 +00:00
Chad Brubaker
e591bf5c89 Merge "Support TrustedCertificateStore.findAllIssuers" am: d58e7b2d15
am: 1e66b26c41  -s ours

* commit '1e66b26c419ec8a73daba7c91c0a3f9ac306c82c':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: Iec0f5e67b84a9659b67d5aaaf19e584d67ccf171
2016-05-12 19:34:51 +00:00
smain@google.com
e8d16b29c3 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd
am: b4c50e1235

* commit 'b4c50e123542b268ec3ff7ef64514557a1cf3701':
  update banner to 2.1 and remove yellow

Change-Id: I10428534b0b4825e1b03818e682472525d5089a0
2016-05-12 19:34:30 +00:00
Felipe Leme
781ba14af2 Fixed connectivity state in some power saving scenarios.
NetworkPolicyManagerService (NPMS) manages 4 type of network restriction
when apps are running on background:

- Data Saver Mode (data usage restriction on metered-networks)
- Battery Saver Mode (power restriction on all networks)
- Doze Mode (power restriction on all networks)
- App Idle (power restriction on all networks)

These restrictions affects 2 parts of the system:

- Internal framework state on NPMS which is propagated to other internal
  classes.
- External firewall rules (managed by netd).

Although each of the power-related restrictions have their own external firewall
rules, internally apps are whitelisted to them through the same
whitelist, and the current code is only updating the internal state (and
notifying the internal listeners) when Battery Saver Mode is on.

As a consequence of this problem, there are scenarios where an app
correctly does not have internet access (because the firewall rules are
properly set), but the NetworkInfo state returns the wrong state (like
CONNECTED / CONNECTED).

This CL fixes this problem by splitting the power-related logic from
updateRulesForRestrictBackgroundLocked() into its own
method (updateRulesForPowerRestrictionsLocked()), and making sure such
method is called whenever the firewall rules are updated.

Externally to this change, the CTS tests were also improved to verify
the apps get the proper connection state; it can be verified by running:

cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

BUG: 28521946
Change-Id: Id5187eb7a59c549ef30e2b17627ae2d734afa789
2016-05-12 12:33:23 -07:00
smain@google.com
17aabff6e0 fix studio download links
Change-Id: I22f65c704ff94de58f0b0100a614107c08fde649
2016-05-12 12:32:42 -07:00
Scott Main
b4c50e1235 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289
am: 55aff78cfd

* commit '55aff78cfd2f60f938eae7f1564d3ccd5c2c9c84':
  update banner to 2.1 and remove yellow

Change-Id: I5aa38003db9207bfc40f353cda6d86070c311520
2016-05-12 19:31:55 +00:00
smain@google.com
55aff78cfd Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs
am: 7eac6f1289

* commit '7eac6f1289052a0845de2fb6cd760d0c2d9b5da0':
  update banner to 2.1 and remove yellow

Change-Id: I343bca6044cc7362d9337b7cddc3da2ab3676dc6
2016-05-12 19:29:20 +00:00
Chad Brubaker
1e66b26c41 Merge "Support TrustedCertificateStore.findAllIssuers"
am: d58e7b2d15

* commit 'd58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
2016-05-12 19:26:47 +00:00
Scott Main
7eac6f1289 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs 2016-05-12 19:25:09 +00:00
smain@google.com
62dfd04dcb update banner to 2.1 and remove yellow
Change-Id: I27c5e046804bbfb79640fe544ff1f07d777c853d
2016-05-12 12:23:20 -07:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Selim Cinek
2e0e23b684 Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I28357779885b1d38acdc4579986293304fa11150
2016-05-12 19:16:59 +00:00
Selim Cinek
95b3120d08 Merge "Fixed a crash when dumping groupmanager" into nyc-dev 2016-05-12 19:09:59 +00:00
Dirk Dougherty
d66be4dcd0 Update billions page related links.
Change-Id: I92585c1410b93000c13b567717905f3b3b24f923
2016-05-12 12:04:14 -07:00
Robert Carr
00c4404576 Merge "Fix surfaceInset adjustment." into nyc-dev
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I648b66bc468cb7d9e48126a69ca44af3c9116614
2016-05-12 19:01:54 +00:00
TreeHugger Robot
663330a325 Merge "Fix surfaceInset adjustment." into nyc-dev 2016-05-12 18:57:58 +00:00
Chris Wren
0c4eeb4985 fix filter for listeners that are not the rocket
Bug: 28664037
Change-Id: Id1e4b243ed7423dbd2d4a8ead829cba9b20f30cd
2016-05-12 14:54:44 -04:00
Andrew Solovay
e4f6677cbb Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183
am: 8363a70024

* commit '8363a70024a53f4934639a1e6c13aae17f4d6d0c':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ida453b78baa5e40a9d2f9241d34ac5ad172efbcd
2016-05-12 18:51:30 +00:00
Andrew Solovay
8363a70024 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571
am: dc4cd59183

* commit 'dc4cd59183fec0d5dc5661e6015f856f66d65ce9':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed
2016-05-12 18:48:50 +00:00
Andrew Solovay
dc4cd59183 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077
am: 76f95f5571

* commit '76f95f557129a583a52b8d7c896510fc3e2e02e8':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I16fb362316afee6e6a4565184ef1c9798e1530be
2016-05-12 18:46:17 +00:00
Andrew Solovay
76f95f5571 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs
am: 9be023f077

* commit '9be023f0772359137f7b4d933add43de2db1aaa0':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I3af5d87f77b5b40c2c7dd7c099f3c62fe4649d28
2016-05-12 18:43:34 +00:00
TreeHugger Robot
9be023f077 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs 2016-05-12 18:41:23 +00:00
Jason Monk
9f3141ebee Merge "Update demo mode time" into nyc-dev
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: I4bc09d1f87754c8ff648b2843219bcd941aee4d8
2016-05-12 18:38:27 +00:00
Jason Monk
341e37d349 Merge "Update demo mode time" into nyc-dev 2016-05-12 18:34:43 +00:00
Robert Carr
e4874a1a4d Don't notify windows of resize during PIP animation.
We are notifying windows of resize as the frame moves (even though the
size does not change) during the pinned animation, confusing and
upsetting the client. We do want to notify it of the one resize
at the beginning or end of the animation, so we can't just block
reportResized on bounds animating. Luckily the other area that adds
windows to reportResized (Task) is smart enough to only do so if the
size has actually changed and not just movement, so we let those reports
go through and block ones initiating from here (which doesn't perform
a check that the size has actually changed).

Bug: 28559097
Change-Id: If1f983e7cc875175ce1d098c385478a9922dea67
2016-05-12 11:26:47 -07:00
Selim Cinek
60ca7879ec Fixed a crash when dumping groupmanager
Change-Id: Id5ffb9e61c1a17d5bd7d8f58024bf84c0fbb6781
Fixes: 28706404
2016-05-12 18:26:32 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e25)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Phil Weaver
14a9987d99 Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev
am: 18e9f13b24

* commit '18e9f13b24867fb4a41391c5512376db413449a8':
  Don't disrupt a11y state when user is unlocked.

Change-Id: Ic5ad0d452e5296edecec98bdfc08b6ea8ad3c9da
2016-05-12 18:07:35 +00:00
Jason Monk
7abe71c532 Update demo mode time
Change-Id: I50885c719ee06cb3fa8c3dda4fe5909efe1cb3e9
Fixes: 28740808
2016-05-12 14:05:18 -04:00
Phil Weaver
18e9f13b24 Merge "Don't disrupt a11y state when user is unlocked." into nyc-dev 2016-05-12 18:00:55 +00:00
Liz Yepsen
20fde769af docs: added "billions" doc in Distribute>Essentials
Adding building for billions guide to Distribute>Essentials section
covering content on building for low-bandwidth and low-cost.

Bug: 27643355
Change-Id: Icb5089fe5528265f4e00b9b9e390a6743c691549
(cherry picked from commit a9884af1e6)
2016-05-12 17:45:27 +00:00
Philip P. Moltmann
ed04cbdc93 Adjust PrintRecommendationService for Konica Minolta.
The reported that:
- Name should be Koni_c_a Minolta
- kmkmkm should not be used as a mDNS identifier

Change-Id: I1ab1910f9a54a396c3bfa109266f6e805349d036
2016-05-12 10:44:08 -07:00
Philip P. Moltmann
9a40a32ae9 Clear state when ProgressMessageCtrl. is canceled
Otherwise the following can happen:
- The progressController is _not_ running and we are running through
  an update.
- Then onUpdateCompleted is called which cancels the not running
  progressController. This then reset whatever state was previously
  stored as mPreviousState leaving the PrintActivity in a weird state.

Fixes: 27945565
Change-Id: Id46b8853ba634634198a74921c8a1790c435678c
2016-05-12 10:35:39 -07:00
Amanda Kassay
dcd343065d Merge "Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am: 77e85d32d6 am: 220f09fb4f am: 9b22357c09" into nyc-dev
am: 3f84c5cb34

* commit '3f84c5cb34cf15ad7c324ff9063f3f5850682791':
  Adding the sdk_vars centralized file back to fix the ndk download page links

Change-Id: I6b8e6a3d00d6aad1b049978374c34a7e66d1396f
2016-05-12 17:16:23 +00:00
Tingting Wang
2fc6bf3936 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
2016-05-12 17:16:17 +00:00
Android Build Merger (Role)
3f84c5cb34 Merge "Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am: 77e85d32d6 am: 220f09fb4f am: 9b22357c09" into nyc-dev 2016-05-12 17:14:09 +00:00
Amanda Kassay
b250ea5f83 Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am: 77e85d32d6 am: 220f09fb4f
am: 9b22357c09

* commit '9b22357c098963fb791ee86434b31fab0d8523d2':
  Adding the sdk_vars centralized file back to fix the ndk download page links

Change-Id: I69362b0be69702e2be57873254ef6d4599dc16c6
2016-05-12 17:13:47 +00:00
Tingting Wang
752129929f Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 2016-05-12 17:11:44 +00:00
Amanda Kassay
9b22357c09 Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am: 77e85d32d6
am: 220f09fb4f

* commit '220f09fb4f6509bec1c344dda542fe3fd04cd997':
  Adding the sdk_vars centralized file back to fix the ndk download page links

Change-Id: I92dc8597a28eacf4d3766ee08473d56ab0e2c006
2016-05-12 17:11:10 +00:00
Amanda Kassay
220f09fb4f Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs
am: 77e85d32d6

* commit '77e85d32d61ce3f0e356a789b8d2dcd907913c1b':
  Adding the sdk_vars centralized file back to fix the ndk download page links

Change-Id: Ib9d0ef5df501970bbca82b6ee59fb8e4c1959df0
2016-05-12 17:08:38 +00:00
Amanda Kassay
77e85d32d6 Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs 2016-05-12 17:06:00 +00:00
Amanda Kassay
059f2d4416 Adding the sdk_vars centralized file back to fix the ndk download page links
Change-Id: I9ef88f8b4dc64dd5260de54d8fbf4555bf630ffc
2016-05-12 13:02:54 -04:00
smain@google.com
7f73a122a6 replace tools videos with latest reto studio videos. am: b69830f76c am: 685953ae53 am: 55272f0f5e
am: 8a68194477

* commit '8a68194477cf938c55bbf7e36509c689d6a54b32':
  replace tools videos with latest reto studio videos.

Change-Id: I477e2967155e08a172b279ac6660005631c61340
2016-05-12 16:38:40 +00:00
smain@google.com
8a68194477 replace tools videos with latest reto studio videos. am: b69830f76c am: 685953ae53
am: 55272f0f5e

* commit '55272f0f5e695c4936af368d2774a3f78108ff56':
  replace tools videos with latest reto studio videos.

Change-Id: I76751d738039f95559393471a33f17a45772749a
2016-05-12 16:36:13 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
smain@google.com
55272f0f5e replace tools videos with latest reto studio videos. am: b69830f76c
am: 685953ae53

* commit '685953ae53b74007ec2049e0b01a9ad5bb3e9d1b':
  replace tools videos with latest reto studio videos.

Change-Id: Ib2532713d29fe7e35765fb7d70fd4521caf3f6c6
2016-05-12 16:33:32 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
smain@google.com
685953ae53 replace tools videos with latest reto studio videos.
am: b69830f76c

* commit 'b69830f76ce3cc4660b6547e3bdeda3ba508d727':
  replace tools videos with latest reto studio videos.

Change-Id: I697251519e2afebbb240e81782f325d801c3f428
2016-05-12 16:30:58 +00:00
Philip P. Moltmann
227b8aa6f2 Merge "Handle failure to create file." into nyc-dev
am: 808f2c361a

* commit '808f2c361af328aad8d69a02779c37f08f1fa32d':
  Handle failure to create file.

Change-Id: I12b7b03e36c4160c5a93e5a72a3395616a44809e
2016-05-12 16:23:39 +00:00
smain@google.com
b69830f76c replace tools videos with latest reto studio videos.
Change-Id: I7953a6834969251533b38f0a8dd67e0d91fede7e
2016-05-12 09:23:31 -07:00