Commit Graph

2888 Commits

Author SHA1 Message Date
Svet Ganov
f1d788adee Merge \"Merge \\"Merge \\\"Use proper lock when accessing the generation registry\\\" into nyc-dev am: dcf2e205bf\\" into nyc-mr1-dev am: d0302f579b\" into nyc-mr1-dev-plus-aosp
am: f910dab5f7

Change-Id: I86bda42056b6af37febccf48ebe09ee6363b50d0
2016-07-07 01:47:45 +00:00
Svet Ganov
eabaf266f8 Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev
am: d0302f579b

Change-Id: I8cd55faa5e8c788752ae411f29f29d9261f327c0
2016-07-07 01:31:55 +00:00
Svet Ganov
84954568db Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489
2016-07-07 01:25:04 +00:00
Svet Ganov
51b839544b Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Daniel Nishi
eeabaa9394 Merge \\"Add counters for the automatic storage manager.\\" into nyc-mr1-dev am: d9f0e37dc1
am: f38d4bb413

Change-Id: Ia595b77f85f4b665cf7b20930544f046ea22b919
2016-06-30 21:31:52 +00:00
Daniel Nishi
f38d4bb413 Merge \"Add counters for the automatic storage manager.\" into nyc-mr1-dev
am: d9f0e37dc1

Change-Id: I00bcd2808aba694d66f1db689acebea26ed5eeee
2016-06-30 21:24:57 +00:00
Daniel Nishi
d9f0e37dc1 Merge "Add counters for the automatic storage manager." into nyc-mr1-dev 2016-06-30 21:17:18 +00:00
Ben Lin
e7822fb767 Provider-level changes for implementing direct eject of a root in Files app.
Several changes at different levels:
1. Introduction of ejectRoot(String) for DocumentsProvider
2. Introduction of ejectRoot(ContentResolver, Uri, String) for
DocumentsContract
4. Additional permission for MOUNT_UNMOUNT for ExternalStorageProvider
5. Implementation of ejectRoot(String) for External StorageProvider

Bug: 29584653
Change-Id: I28557af63259548784cf24d5b051eb06ad5193ca
(cherry picked from commit 2ccc18357d6741dde56edc4d5a2608f15f4b9078)
2016-06-29 23:06:51 +00:00
Daniel Nishi
f06f1b8180 Merge \\"Use the Deletion Helper when system storage is low.\\" into nyc-mr1-dev am: 6401217532
am: b8a7ddad7e

Change-Id: I3d51bb6934e4a42ec8e9d7f37d460b780a5941fe
2016-06-29 21:54:10 +00:00
Daniel Nishi
b8a7ddad7e Merge \"Use the Deletion Helper when system storage is low.\" into nyc-mr1-dev
am: 6401217532

Change-Id: I9d8645a32185a8749edeeee654ee81bdd00f240f
2016-06-29 21:47:05 +00:00
Daniel Nishi
6401217532 Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev 2016-06-29 21:37:07 +00:00
Daniel Nishi
690346b145 Use the Deletion Helper when system storage is low.
A notification is posted when the system storage gets too low.
Currently, it redirects into the Storage Settings. Instead,
it should redirect into the Deletion Helper to directly let the
user clear out their storage.

Bug: 29437277
Change-Id: I4e35adf300d5e479d4171f1e6f090f2a757400f2
2016-06-27 15:22:35 -07:00
Daniel Nishi
f678cc9c2b Add counters for the automatic storage manager.
In order to attribute storage savings, we log how much data has
been freed and the last time that the automatic storage manager
has run.

Bug: 29643106
Change-Id: Ibb57b44b5e7550d4ab11e95b47db2f5d6599a96f
2016-06-24 15:49:25 -07:00
Dmitri Plotnikov
abcc4392e9 Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8
am: 89858c58af

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9
2016-06-24 00:37:57 +00:00
Dmitri Plotnikov
89858c58af Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8 Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev 2016-06-24 00:23:13 +00:00
Chris Manton
e18f55e2ac Merge \\"Add global settings for cell radio state\\" into nyc-mr1-dev am: d4ac4c7786
am: 8bfefbbb53

Change-Id: I44d2ab2580ebbb395ebc511a1be61fc46a2c1d4f
2016-06-23 17:10:45 +00:00
Chris Manton
8bfefbbb53 Merge \"Add global settings for cell radio state\" into nyc-mr1-dev
am: d4ac4c7786

Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
2016-06-23 16:56:04 +00:00
Chris Manton
d4ac4c7786 Merge "Add global settings for cell radio state" into nyc-mr1-dev 2016-06-23 16:42:16 +00:00
Ta-wei Yen
3bfaeb7c6f Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a0591
am: 6b4c1e2d9b

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
2016-06-23 02:41:07 +00:00
Ta-wei Yen
6b4c1e2d9b Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev
am: fbb87a0591

Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
2016-06-23 02:35:38 +00:00
Ta-wei Yen
1121017213 Add more configuration state for visual voicemail
Bug: 26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
2016-06-22 17:48:52 -07:00
Chris Manton
95a6c899d6 Add global settings for cell radio state
Provide persistable state for cell radio
to handle airplane mode similar to any
other radio in the system.

Change-Id: I87398fe84de3f6a10b0e1002e9e5bf7e61f9441f
2016-06-22 16:44:53 -07:00
Dmitri Plotnikov
f19b6ec8bb Unhiding DEVICE_NAME
Bug: 28439637
Change-Id: Iea9efbaf18b2110c21f0d27a3e44fd6590f2d372
2016-06-21 16:22:56 -07:00
Svetoslav Ganov
1b288ed197 Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: ee4c0a3c7e
am: 235411a3bc

Change-Id: Id4d016ea2963b000d0a401eeb22a1740f012794b
2016-06-18 02:29:12 +00:00
Svetoslav Ganov
8011f5ed1c Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: If28342d6deab7d0b7e89029229bad060ce7c8a8d
2016-06-18 02:22:52 +00:00
Svetoslav Ganov
235411a3bc Merge \\"Fix a race in local settings caches\\" into nyc-dev am: f4ddb7ce30
am: ee4c0a3c7e

Change-Id: If795ce9ea8fe36c9919170d0ded12bf488fb8a49
2016-06-18 00:42:16 +00:00
Svetoslav Ganov
ee4c0a3c7e Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: Ia973ef68382ac359908b83be3dbca485c91d5cd6
2016-06-18 00:38:28 +00:00
Svetoslav Ganov
8c35dcc7ae Fix a race in local settings caches
We send a handle to the generation tracker along with the first accessed
setting but don't send the generation id of when the setting was
actually looked up. So by the time the client gets the setting with the
generation tracker from which to get and cache the last generation the
setting may have changed. We need to pass the generation id along with
the value and the generation tracker.

bug:29458487

Change-Id: I0ac4955ba5b10b547f8fe653a7c28e048a4691eb
2016-06-17 15:30:45 -07:00
Todd Kennedy
20c0209e2f Merge \\"New API w/ multiple prefixes\\" into nyc-mr1-dev am: d07b87cb1c
am: 162b74a6fd

Change-Id: I81d79930c6d3d42be61a9ab1cdb5f29d677cd3de
2016-06-15 00:07:56 +00:00
Todd Kennedy
162b74a6fd Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
am: d07b87cb1c

Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6
2016-06-15 00:03:12 +00:00
Todd Kennedy
a97045b245 New API w/ multiple prefixes
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation

Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
2016-06-14 16:01:05 -07:00
Doris Ling
8cdceba0dc Merge \\"Added config system navigation keys.\\" into nyc-mr1-dev am: 32300db186
am: 4be6c44ee2

Change-Id: I45ff845e5cf67d738c1f25b26bcd7acfe50ea9eb
2016-06-14 22:57:23 +00:00
Doris Ling
4be6c44ee2 Merge \"Added config system navigation keys.\" into nyc-mr1-dev
am: 32300db186

Change-Id: I9de582c7ae95aa36fbae75be6b72b4ffc01ae695
2016-06-14 22:39:50 +00:00
Doris Ling
32300db186 Merge "Added config system navigation keys." into nyc-mr1-dev 2016-06-14 22:35:19 +00:00
Daniel Nishi
b382bb2c2f Merge \"Merge \\"Add a flag to toggle how much the storage manager should retain.\\" into nyc-mr1-dev am: 7374971c28\" into nyc-mr1-dev-plus-aosp
am: 5fdb94ce1e

Change-Id: I30188ebb95237cc3fa43533d1b5c1df08f8cf4dc
2016-06-13 22:48:42 +00:00
Daniel Nishi
d630a5b9a4 Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev
am: 7374971c28

Change-Id: I17595b0268e73d9b3193eb81f6779278d2502efa
2016-06-13 22:28:18 +00:00
Daniel Nishi
c535be179a Add a flag to toggle how much the storage manager should retain.
This flag is used to set how many days of storage the automatic
storage manager will retain when clearing data.

Bug: 28965462
Change-Id: I87afafb7d3252d8c390ea43b7c45fd923f911e4e
2016-06-13 10:54:31 -07:00
Doris Ling
628cea45e2 Added config system navigation keys.
1. Added config_supportSystemNavigationKeys to config and symbols
2. Added SYSTEM_NAVIGATION_KEYS_ENABLED to Settings.Global
3. Updated PhoneWindowManager to check for the system navigation keys enabled
   flag before expanding or collapsing the notification panel.

Bug 29120082

Change-Id: Ia73078520474ce5a1cbf2256c0d793ed74bbf589
2016-06-10 13:27:42 -07:00
Makoto Onuki
0a86dd6120 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev am: a9f262d649
am: 4169184518

* commit '416918451846518d1ff42d45ad361a7b9df19934':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ie88b05c3997045bed66fc72b115f6f7e48b5d970
2016-06-02 21:07:51 +00:00
Chris Tate
4169184518 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077
am: 4872e3df96

* commit '4872e3df962a386576b51e03a26add0ceb700698':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Idabd2988d6b63e06a018c24c1b3a9e17514596b3
2016-06-02 20:55:53 +00:00
Christopher Tate
0cd6ca14eb Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia950b6992e76d05bccd5773cdda04308ddb054c0
2016-06-02 20:55:28 +00:00
Christopher Tate
4872e3df96 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
2016-06-02 20:49:27 +00:00
Chris Tate
453951d077 Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev 2016-06-02 20:45:16 +00:00
Chris Wren
3a716c735b resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01
am: be2da62d11

* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
  make the notification enqueue rate threshold a setting

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
2016-06-02 16:48:13 +00:00
Chris Wren
be2da62d11 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
am: d958f83a01

* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
  make the notification enqueue rate threshold a setting

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
2016-06-02 16:41:30 +00:00
Chris Wren
d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04:00
Chris Wren
35f49c5968 Merge "make the notification enqueue rate threshold a setting" into nyc-dev
am: 43c3a7e5a7

* commit '43c3a7e5a781640b862cf6f51805b3823f46fd02':
  make the notification enqueue rate threshold a setting

Change-Id: I3e8c37aead7e1f2d5dc9fc89b72f82294bd16cfe
2016-06-02 15:13:43 +00:00
TreeHugger Robot
43c3a7e5a7 Merge "make the notification enqueue rate threshold a setting" into nyc-dev 2016-06-02 15:08:03 +00:00
Chris Wren
763a9bb095 make the notification enqueue rate threshold a setting
Bug: 28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
2016-06-02 15:07:20 +00:00