Commit Graph

246497 Commits

Author SHA1 Message Date
Svet Ganov
f4e2832742 Merge "Persist settings on a dedicated background thread" into nyc-dev
am: 00749aeb15

* commit '00749aeb15d52151fcc9f9051b525840c49e14ce':
  Persist settings on a dedicated background thread

Change-Id: I62d1cf9a8955ea949c420c1eb62645bff325da2a
2016-05-12 19:57:42 +00:00
smain@google.com
ce4a989122 missed another old link
Change-Id: I9f618e674a566b50fa2635a6e6cd2f00e53a27dd
2016-05-12 12:55:51 -07:00
Svetoslav Ganov
00749aeb15 Merge "Persist settings on a dedicated background thread" into nyc-dev 2016-05-12 19:51:58 +00:00
smain@google.com
83b3509341 fix studio download links am: 17aabff6e0 am: 740d47f46f am: c878bcef1f
am: f41f6a634e

* commit 'f41f6a634eef04dfad4620814c65e9683c944927':
  fix studio download links

Change-Id: Ibebd6a831f8ce81ed08378e12f75c78938751add
2016-05-12 19:51:22 +00:00
smain@google.com
f41f6a634e fix studio download links am: 17aabff6e0 am: 740d47f46f
am: c878bcef1f

* commit 'c878bcef1f71c241473dcf59762155cc3e133fb4':
  fix studio download links

Change-Id: Iad2d9da633014b138e090f152bdad9b4e6546441
2016-05-12 19:48:41 +00:00
smain@google.com
c878bcef1f fix studio download links am: 17aabff6e0
am: 740d47f46f

* commit '740d47f46f65ced23f402e4cba6ea1e80501de61':
  fix studio download links

Change-Id: I509f17ce4a0106b540a6d443d8a41d13976a094d
2016-05-12 19:45:48 +00:00
Robert Carr
0fe993b54a Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev
am: 562ea5ceb5

* commit '562ea5ceb5e10a3ea4dfd3825b2d639fbc6506b0':
  Don't notify windows of resize during PIP animation.

Change-Id: I759b052e5447fe7cd703face366c20e95cdbe6bd
2016-05-12 19:42:23 +00:00
smain@google.com
740d47f46f fix studio download links
am: 17aabff6e0

* commit '17aabff6e0926415fd4e4521c88362ba97edfccb':
  fix studio download links

Change-Id: Idc4c1bf1345cb9104ee43996c89bfd458868ef85
2016-05-12 19:42:19 +00:00
Scott Main
103ba00c99 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235
am: e8d16b29c3

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

Change-Id: I9dde62e39329d027f6beb1e14814bd882c76b15b
2016-05-12 19:37:06 +00:00
TreeHugger Robot
562ea5ceb5 Merge "Don't notify windows of resize during PIP animation." into nyc-dev 2016-05-12 19:35:25 +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
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
Selim Cinek
dc1bc46ea8 Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

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

Change-Id: I65eee546cb3bfc3b7f0a841eeb5e1ed333f696b5
2016-05-12 19:16:57 +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
ea84ad75d3 Merge "Fix surfaceInset adjustment." into nyc-dev
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I9274121cdbd8ea8ed656478b98d6cd4b740834b8
2016-05-12 19:01:46 +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
5e7d6e6daa 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: I4efc79802eeb2ecdc72a3cba21862313de1225df
2016-05-12 18:51:27 +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
c178881033 Merge "Update demo mode time" into nyc-dev
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: Ia64c7c33aeaf66ef48f29362c68319b4abcdfdbd
2016-05-12 18:38:25 +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
Phil Weaver
b60d029ed2 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: I03a057fb4278466250395958252a349d4dfe2e3c
2016-05-12 18:07:32 +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
59ce88720c 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: I5974c397012387a29c062e477cab0823a21f7e9e
2016-05-12 17:24:24 +00:00
Tingting Wang
7531057944 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
am: 752129929f

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

Change-Id: I93f0b86af829eafa6e8425b360a323c48df67776
2016-05-12 17:24:20 +00:00
smain@google.com
6bb10b8041 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: I2a214e9610e7d6150c933ede111c1ce80ec21fe2
2016-05-12 17:24:16 +00:00
Makoto Onuki
0ac2961dcb Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9  -s ours

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I02f70f07d24d3c7f58036d4e1535020074a1d3f0
2016-05-12 17:24:12 +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
Philip P. Moltmann
391dbbf022 Merge "Handle failure to create file." into nyc-dev
am: 808f2c361a

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

Change-Id: Ib48bb107c6a8d39768ac21a54f32cf18318ff357
2016-05-12 16:53:54 +00:00