Commit Graph

2859 Commits

Author SHA1 Message Date
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
Ta-wei Yen
9e4df538ef Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev am: 912e2b2c80
am: cbf3aa8789

* commit 'cbf3aa8789341c60b1db6cfaaa7033e3623db810':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I196ff66863f852808ffbe2d67e5878f049b15a75
2016-06-02 00:41:02 +00:00
Ta-wei Yen
cbf3aa8789 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
am: 912e2b2c80

* commit '912e2b2c80ba7641f649ae7e130d9febc4caac44':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
2016-06-01 23:26:31 +00:00
Ta-wei Yen
912e2b2c80 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 2016-06-01 21:49:47 +00:00
Ta-wei Yen
c75b215eb3 Add support for source-specific VVM state in VoicemailContract
Negative values of the field CONFIGURATION_STATE, DATA_CHANNEL_STATE,
NOTIFICATION_CHANNEL_STATE is reserved to voicemail source for its'
specific errors. SOURCE_TYPE can be set to help interpret the error
codes.

Typically the OMTP visual voicemail source will set SOURCE_TYPE to the
same value of visual voicemail type set with 
CarrierConfigManager.KEY_VVM_TYPE_STRING, such as "vvm_type_omtp".

For example, the OMTP visual voicemail source could set 
CONFIGURAITON_STATE to -5 and SOURCE_TYPE to "vvm_type_foo", and the
client can find -5 for "vvm_type_foo" means "PIN is not set by the user"

+ Field SOURCE_TYPE
+ Docs to specify negative values are reserved for the source
- Removed hidden helper method SetStatus() and SetQuota(). The 'ignore'
  value is conflicting with reserved values.

Bug:26944391
Change-Id: I0930f684dadd25ae94e3ea68a7658c7ae423e3e3
2016-06-01 20:04:57 +00:00
Dianne Hackborn
5101b95710 resolve merge conflicts of e174476 to master
Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f
2016-06-01 12:01:38 -07:00
Dianne Hackborn
e174476b70 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c
am: 576430f36a

* commit '576430f36ac04843fed5697ecae1716489c164bb':
  Work on issue #28942589: Tune job scheduler

Change-Id: I101010ff1d7d88c2ccac14d095df7722569cf549
2016-06-01 16:45:40 +00:00
Dianne Hackborn
576430f36a Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549
2016-06-01 16:38:18 +00:00
Dianne Hackborn
0e443c1320 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
2016-06-01 16:38:12 +00:00
Dianne Hackborn
e9a988caca Work on issue #28942589: Tune job scheduler
We now have a new settings key that provides all of the existing
tuning parameters, plus some newly redone ones for dealing with
different memory levels.

Changed the minimum batching for overall jobs from 2 to 1, so
we will never get in the way of immediately scheduling jobs
when the developer asks for this.  We should now be able to rely
on the doze modes to do better batching of jobs for us when it
is really important.

Also work on issue #28981330: Excessive JobScheduler wakeup alarms.
Use a work source with scheduled alarms to blame them on the app
whose job they are being scheduled for, and add a check for whether
a job's timing constraint has been satisfied before considering it
a possible candidate for the next alarm.  (If it is satisified,
the time is in the past, so we should not schedule an alarm for it.)

Finally clean up a bunch of the dumpsys output to make it easier
to understand.

Change-Id: I06cf2c1310448f47cf386f393e9b267335fabaeb
2016-05-31 18:16:19 -07:00
Christopher Tate
1d7d9404e0 Don't back up/restore the "automatically restore app data" setting
It stomps on the Setup Wizard intended [or user-supplied!] behavior.

Bug 29030834

Change-Id: Iabb0ff88b7f8b9130abb59af68872d02e5534140
2016-05-31 12:03:25 -07:00
Felipe Leme
6afa2e1d1d Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9
am: d786355405

* commit 'd786355405dfb50b1e6eb0bb8628276b9b2823c6':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ic8f6cbfce572c54d7124a508af12043a58d5bc66
2016-05-27 23:43:14 +00:00
Felipe Leme
d786355405 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860
am: 8c8ea506d9

* commit '8c8ea506d91db44de1d312612a8f63ab107af799':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Iaffe5981b299eca5756666bd03c67a84c8e15283
2016-05-27 20:08:59 +00:00
Felipe Leme
feaa8982fc Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: I11bf96280ac5e143d5260cb20238da38b4e0eaa3
2016-05-27 20:04:25 +00:00
Felipe Leme
8c8ea506d9 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
2016-05-27 20:04:22 +00:00
Felipe Leme
a1b79bfd7a Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.
This scenario typically happens when the device is on Doze Mode and a
notification action is triggered from a Wear device.

In a nutshell, the workflow is:

- ProcessRecord has a flag telling whether a process has "whitelist
  management" privileges.
- When NotificationManager binds a new NotificationListenerService, it
  sets the BIND_ALLOW_WHITELIST_MANAGEMENT flag.
- On bind(), ActiveService asserts that only system apps can set that
  flag.
- On computeOomAdjLocked(), ActivityManagerService sets the
  ProcessRecord flag if necessary.
- Upon creating a notification, NotificationManager calls AM to mark its
  PendingIntents as coming from a notification.
- When PendingIntentRecord sends it to the target, it checks if it's
  from a notification and if so calls AM to do the temp whitelist.
- On unbind(), ActiveService removes the ProcessRecord flag if necessary.

Fixes: 28818704

Change-Id: I00d46036a2cbb73f7f733fd35bf0b743a02807a1
2016-05-27 11:45:09 -07:00
Seigo Nonaka
a0cb2c4931 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: b03e7217f3
am: d34ca400c6

* commit 'd34ca400c6f8cd25827e0278dd9062d82b0fbf08':
  Fix system locale propagation during user creation.

Change-Id: I41229dce52266d59c3b3334e2d4ae390b75bbe20
2016-05-26 04:34:26 +00:00
Seigo Nonaka
d34ca400c6 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
2016-05-26 04:17:39 +00:00
Seigo Nonaka
b03e7217f3 Merge "Fix system locale propagation during user creation." into nyc-dev
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
2016-05-26 04:07:40 +00:00
Seigo Nonaka
005ef10518 Merge "Fix system locale propagation during user creation." into nyc-dev
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: I020babcf2ce1aa632099457f2baf3497f5ac2946
2016-05-26 04:07:33 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Daniel Nishi
15d6c4bf7c Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev
am: 9746deefbb

* commit '9746deefbbfa3f6561bdf27e7d697cc352853f13':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: Icd5688b8ea9c72c6bab9dbb0eedd895bd0b09aca
2016-05-25 00:18:39 +00:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Daniel Nishi
395d387c2c Add a flag to toggle the automatic storage manager on and off.
This flag will be used in both Settings and Setup Wizard to enable
and disable the automatic storage manager.

Bug:28905328
Change-Id: Iafc374448d96171ad0a4c36f6fea5e0118105a8c
2016-05-23 14:20:22 -07:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
2016-05-20 20:00:39 +00:00
Seigo Nonaka
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
2016-05-20 19:52:55 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
2016-05-20 19:52:54 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
2016-05-20 17:59:35 +00:00