Commit Graph

2767 Commits

Author SHA1 Message Date
Steve McKay
b8995b7abc Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1
am: 6fdaf2f2cf

* commit '6fdaf2f2cf0d060c7f99baa28ff0514c31faa84f':
  Don't show new-window item in Downloads per Gabe.

Change-Id: If6dbf8d3d23f3e97fcf2db9ad7261c9217bfa631
2016-05-13 17:34:16 +00:00
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
2016-05-13 17:31:35 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Steven Ng
a62fc512da Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
am: e333b2eb81

* commit 'e333b2eb81958cc8d27eb687ebd84844a84919ea':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I625b51c1e257afa095dfacb3bcf481fb2068b56f
2016-05-13 11:36:20 +00:00
Steven Ng
e333b2eb81 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev 2016-05-13 11:27:59 +00:00
Tingting Wang
c8242b22ab Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f
am: 2fc6bf3936

* commit '2fc6bf3936951764569bef3256bf41823f3986d4':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ib348fbd43a4071156894045e301554ac2631127f
2016-05-12 17:24:34 +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
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
Tingting Wang
e0cbda454c Rename CONTACT_METADATA_SYNC GService Flag.
Rename it to CONTACT_METADATA_SYNC_ENABLED.

BUG 28295805

Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d
2016-05-10 17:29:00 -07:00
Steve McKay
f570c771f2 Don't show new-window item in Downloads per Gabe.
Also, fix regression...don't show "internal storage" option in Downloads.
All other modes, fix inconsistencies in presentation of
internal-storage/new-windows commands by eliminating launch mode inference.
Update VolumeInfo and MTP provider to send correct launch mode extra.

Bug: 28691735,28695347
Change-Id: Ic480925f4c8f1beee4da104a2259c1ce5f28a6a1
2016-05-10 16:25:58 -07:00
Tyler Gunn
824697c339 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev
am: b6029e3ba5

* commit 'b6029e3ba54a73bd95ef63caa337e00b8951e024':
  Un-@hide multi-endpoint APIs.

Change-Id: I9f8e5f933b12b523a81c40e8ff5ac4b8b972228f
2016-05-09 18:18:55 +00:00
Tyler Gunn
b6029e3ba5 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev 2016-05-09 18:12:45 +00:00
Tony Mak
a31f37dc1c Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e
am: ecab71c9f7

* commit 'ecab71c9f77cb0386a1be1c78e73bedf2524a536':
  Fix enterprise contacts APIs naming and docs

Change-Id: Idad8e3ee643ba955951a58185f4a8640579db206
2016-05-06 12:23:58 +00:00
Ricky Wai
de1e4a1048 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I22bd5f8f3d71ae19a2fcac139531243f2546033e
2016-05-06 12:19:00 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
Tyler Gunn
2cbe2b5816 Un-@hide multi-endpoint APIs.
Bug: 28621640
This reverts commit 1bf206b766.
Change-Id: If8c85e4adeb017eec2b7e8199010deae2a920c6a
2016-05-06 03:07:45 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Steven Ng
dc20ba69bf Add a Global setting for disabling OEM unlocking setting
+ By default, OEM unlocking setting is enabled.
+ Add a check to prevent oem unlock being flipped if the setting isn't
  enabled.

Bug: 28163088
Change-Id: I087d8d5a1d99a611a8f66ff71a92ec9ea1da4e9f
2016-05-04 19:52:02 +00:00
Abhijith Shastry
71048da608 Merge "Update BlockedNumberContract documentation." into nyc-dev
am: 9a2384a7a6

* commit '9a2384a7a6ad4ff630f125e844f7b202ec3cc649':
  Update BlockedNumberContract documentation.

Change-Id: Ia5962709e57374db6f01c7ba97d4a2dcf26a7b6e
2016-05-04 18:22:39 +00:00
Abhijith Shastry
9a2384a7a6 Merge "Update BlockedNumberContract documentation." into nyc-dev 2016-05-04 18:14:38 +00:00
Renat Aksitov
967d99f033 Merge "Voice Messaging Intent API." into nyc-dev
am: d516e30b91

* commit 'd516e30b915ffabd0c09f5726d44c1f51fdeceec':
  Voice Messaging Intent API.

Change-Id: Id1665e31f427a81c8052456226e0383473793682
2016-05-04 18:09:17 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
Tony Mak
aded4dbf5e New settings key and policy transparency for managed profile settings
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: I5e5d30e39e1ba3c25a589fd6123f3a926b5745ba
2016-05-04 09:47:33 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
2016-05-04 09:33:08 +00:00
Abhijith Shastry
1705fc4767 Update BlockedNumberContract documentation.
For secondary users, a SecurityException is thrown instead of UnsupportedOperationException.

BUG: 28294786
Change-Id: I6402b856eeb02c4c1d940606ae7e69f3ae9cb45d
2016-05-03 17:18:02 -07:00
Jason Monk
42d0121441 Add action to launch webview implementation settings
Bug: 28554048
Change-Id: I5ccdf5350c216949890d79b2b306b935a5949824
2016-05-03 14:16:56 -04:00
Renat Aksitov
c8dd93d4c8 Voice Messaging Intent API.
Adding missing items about MIME type and account type to the
"integration with the Contacts Provider" section.

Bug 28295510

Change-Id: I890458e62a714519be70e930fd53315c141ba354
2016-05-02 09:22:02 -07:00
Pierre Imai
617c9a3625 Merge changes I86257bc8,I5c2221c5 into nyc-dev
am: 4a992cbde8

* commit '4a992cbde834fdf3770e34b21361b47f4786f65f':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I80fdc381bd3ff33a8efa6624d7115c346789ca17
2016-05-02 13:00:13 +00:00
Lorenzo Colitti
4a992cbde8 Merge changes I86257bc8,I5c2221c5 into nyc-dev
* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
2016-05-02 12:49:19 +00:00
Pierre Imai
8e48e67827 Add Gservices settings for resolver configuration.
BUG: 25731675

Change-Id: I5c2221c5a2478fe2fa0fdf9ceeb13a932d758d33
2016-05-02 08:26:09 +00:00
Lorenzo Colitti
52e5f2e5ec Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: Ib9f1352386ebe667ec5d3d110f64e080c04c103d
2016-04-29 15:24:42 +00:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings.
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
2016-04-29 22:19:23 +09:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
2016-04-28 19:24:58 +00:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance.
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
2016-04-28 10:51:39 -06:00
Lorenzo Colitti
40ead811e0 Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7
2016-04-28 05:25:22 +00:00
Lorenzo Colitti
c5be12e7ac Make isCaptivePortal perform both HTTP and HTTPS probes.
Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
2016-04-28 11:23:10 +09:00
Felipe Leme
89ba9ddf26 Merge "Update background data restrictions intent javadoc." into nyc-dev
am: 8b5e9f1

* commit '8b5e9f1bcf25ae38f812dc750772cf19abba6638':
  Update background data restrictions intent javadoc.

Change-Id: Iaa01becc95debb5aa68cd8308bbe69936e769508
2016-04-27 21:21:00 +00:00
TreeHugger Robot
8b5e9f1bcf Merge "Update background data restrictions intent javadoc." into nyc-dev 2016-04-27 21:16:00 +00:00
Felipe Leme
2850b56b9e Update background data restrictions intent javadoc.
BUG: 26820898
Change-Id: Ib2ed6835708ec77926fe49264ccf65a0aaf9a984
2016-04-26 13:57:00 -07:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Julia Reynolds
d72d5823b8 Merge changes from topic \'api_review\' into nyc-dev
am: a0676c9

* commit 'a0676c92078b3d5abd850052db80e3b619ce1c5f':
  Api review: Settings.
  Reduce spacing.

Change-Id: I53898c0378b124a6b44872493e481d10dfd6518f
2016-04-26 15:38:00 +00:00
Julia Reynolds
a0676c9207 Merge changes from topic 'api_review' into nyc-dev
* changes:
  Api review: Settings.
  Reduce spacing.
2016-04-26 15:29:11 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
Julia Reynolds
0aa7d615c2 Api review: Settings.
Hide notification policy setting.

Bug: 28295513
Change-Id: Ic117285c3eb07cb4bf399e233adad835772b9673
2016-04-25 14:57:33 -04:00
Ricky Wai
149a6c9034 Fix enterprise contacts APIs naming and docs
Bug: 28295752
Change-Id: I504af42ab1146c6c82f54773c25450d41445345c
2016-04-25 12:14:53 +01:00
Jeff Sharkey
f07c7b9fd0 API changes for DownloadManager and JobScheduler.
To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 28098882, 26571724, 19821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110
2016-04-24 14:39:34 -06:00