Commit Graph

8176 Commits

Author SHA1 Message Date
Daniel Sandler
aefdfa5721 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev am: 3af45bd
am: 73a694b

* commit '73a694b486b8b37d7e61e5ad53b3c9b139b783e9':
  Allow system apps to substitute a different app name in notifications.

Change-Id: Id47615712e65e8a11edd68dcd729824c9c37c85a
2016-04-14 19:29:49 +00:00
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
2016-04-14 19:26:09 +00:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
2016-04-14 10:27:31 -07:00
Dan Sandler
73a694b486 Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
am: 3af45bd

* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
  Allow system apps to substitute a different app name in notifications.

Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Dan Sandler
732bd6cb27 Allow system apps to substitute a different app name in notifications.
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.

The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).

Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Dianne Hackborn
034b58c2f5 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev
am: 9e31b3f

* commit '9e31b3fd817aed28d9afd712fa49ec9d6fc11329':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I7c227898d175c15219192fc42c5e4eb5121e9517
2016-04-13 23:37:31 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Adam Lesinski
f2489ad456 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: b5abb78
am: eaf83ef

* commit 'eaf83ef61b33383ae47d1e2e96e99d7d312d2d3b':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: If52c56fbc0ffff43e5eb836aacd11f3f8764e4c7
2016-04-13 22:37:08 +00:00
Adam Lesinski
eaf83ef61b Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: b5abb78

* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
2016-04-13 22:25:45 +00:00
Adam Lesinski
b5abb78b7c Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-13 21:53:47 +00:00
Adam Lesinski
5520581b5f Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: Ifa4672929df286c4693ab1f77716f08945941b0c
2016-04-13 13:25:09 -07:00
Sudheer Shanka
38e0c19717 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev am: fd580f7
am: 0306304

* commit '03063041002228b247d68a53198c76824a8d30f3':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: I1ea3d55c212811c118c8912fe8a8efa302938e60
2016-04-13 20:24:59 +00:00
Sudheer Shanka
0306304100 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev
am: fd580f7

* commit 'fd580f7d1a5a19b062bea49602f0f6136bce7e5e':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: Ia7286ea72f55ec5e717785ecd30c05f6ae92d673
2016-04-13 20:21:34 +00:00
Sudheer Shanka
fd580f7d1a Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev 2016-04-13 20:12:05 +00:00
Mitchell Wills
e852018db5 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev am: 3c58709
am: 53560db

* commit '53560db137aeab0a25c6a81c61da4426a676ce37':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: If2d49d771b63e0fd1bd96bdd976048da9435648a
2016-04-13 18:56:25 +00:00
Mitchell Wills
53560db137 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev
am: 3c58709

* commit '3c5870912b6dc20e13c3af5e078a600b88904e99':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: Ia2c6bb955461884e88d13af885e0011fcafec7b5
2016-04-13 18:53:05 +00:00
Mitchell Wills
3c5870912b Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev 2016-04-13 18:41:55 +00:00
Dianne Hackborn
8db0fc15b8 More work on issue #26390151: Add new JobScheduler API...
...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: If3fdff23c00c2f1b99901a9be096d851562d3439
2016-04-13 10:54:16 -07:00
Dianne Hackborn
7d4844eaba Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev am: e3f617b
am: 3ba3ad2

* commit '3ba3ad21880ebc0b17171545e7c226b63e2c473b':
  Fix issue #28035090: Disallow abuse of JobScheduler

Change-Id: I4a02d5fed734846b1e9068950376d6db01cb0aba
2016-04-13 17:53:06 +00:00
Dianne Hackborn
3ba3ad2188 Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev
am: e3f617b

* commit 'e3f617b23f202e11d4ee67d322609ee7b07b11bb':
  Fix issue #28035090: Disallow abuse of JobScheduler

Change-Id: I8ed129b1c5daabbddc57fdb95efdd15ba101184d
2016-04-13 17:49:32 +00:00
Dianne Hackborn
e3f617b23f Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev 2016-04-13 17:44:52 +00:00
Dianne Hackborn
807de78c07 Fix issue #28035090: Disallow abuse of JobScheduler
We now keep track of how long each app has been running a job
for, in 30 minute batches.  If it is running jobs frequently,
we will bump down the priority its jobs run at to allow other
jobs to run before it.

Currently we count both pending and active as the job running,
which means that an app that has jobs waiting in the pending
queue will count against its abuse prevention.  This could
allow starvation -- if we bump down the priority of an app's
jobs and the system is so busy continually that they sit
in the pending queue a lot -- it could never recover.  But I
think that is okay...  if we are really in a state where we
are continually running as many jobs as possible, we probably
have other larger issues.

Change-Id: I838aa4b5840e91df49a1e17b53188d6e4a66a6d1
2016-04-13 10:42:51 -07:00
Michal Karpinski
dc8ac6fbb5 Merge "API polish in DPM for organization color and name methods" into nyc-dev am: 1271cef
am: 96d49b1

* commit '96d49b1ac6e197f64103e5454e308f65609b2853':
  API polish in DPM for organization color and name methods

Change-Id: I90b74fa1b0c3e2961fb26fc5e84e85d5bc5da1f5
2016-04-13 13:40:03 +00:00
Michal Karpinski
96d49b1ac6 Merge "API polish in DPM for organization color and name methods" into nyc-dev
am: 1271cef

* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
  API polish in DPM for organization color and name methods

Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
2016-04-13 13:36:44 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Clara Bayarri
a0c2dc3cf5 Provide startIntentSenderForResult for fragments
Bug: 27700608
Change-Id: Ibb7689ba0527048dd5944c4315b986f16030081d
2016-04-13 12:33:30 +01:00
TreeHugger Robot
a1cdc96faa Merge "TRON refinements for multi-window" into nyc-dev am: a74888d
am: e203cde

* commit 'e203cdefa1cc34057230ad83fdc5ef172e96f080':
  TRON refinements for multi-window

Change-Id: I2edd0f1e9b851234c21e42cd2e22e127a155e21f
2016-04-13 04:28:59 +00:00
Jorim Jaggi
e203cdefa1 Merge "TRON refinements for multi-window" into nyc-dev
am: a74888d

* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
  TRON refinements for multi-window

Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6 Merge "TRON refinements for multi-window" into nyc-dev 2016-04-13 04:18:31 +00:00
TreeHugger Robot
1aa27fccb7 Merge "Added api to delete cache files for a given user" into nyc-dev am: 0a6a6db
am: 7b13098

* commit '7b13098b6299530348c836266d74369b0ff0b3d4':
  Added api to delete cache files for a given user

Change-Id: I4a2c3d4137e2f48bf3e57c3a54c0ed5e573ed66e
2016-04-13 03:20:27 +00:00
Suprabh Shukla
7b13098b62 Merge "Added api to delete cache files for a given user" into nyc-dev
am: 0a6a6db

* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
  Added api to delete cache files for a given user

Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91 Merge "Added api to delete cache files for a given user" into nyc-dev 2016-04-13 03:13:49 +00:00
Jorim Jaggi
29379ec859 TRON refinements for multi-window
Bug: 26013430
Change-Id: I89b139b4ca3e7b6a06d8b5b351d67ffac240f73f
2016-04-12 19:43:52 -07:00
TreeHugger Robot
d1e516f071 Merge "Fix broken actions with MessagingStyle" into nyc-dev am: 4ecc0ce
am: 36feadc

* commit '36feadc46c7a25a6fffe07d3187803fd72b88b5e':
  Fix broken actions with MessagingStyle

Change-Id: I192757a1ca04ad32bcd0eb8fbac47e2a381b3f96
2016-04-13 02:01:32 +00:00
Suprabh Shukla
78c9eb8947 Added api to delete cache files for a given user
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.

Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
2016-04-12 18:23:56 -07:00
Adrian Roos
36feadc46c Merge "Fix broken actions with MessagingStyle" into nyc-dev
am: 4ecc0ce

* commit '4ecc0ce387195c44f5737d5b155c0dd1ea00add7':
  Fix broken actions with MessagingStyle

Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
2016-04-13 01:02:18 +00:00
Adrian Roos
b801527604 Merge "Merge "Notification MessagingStyle: Add handset views" into nyc-dev am: 4db2f1f" into nyc-dev-plus-aosp
am: 34f82ca

* commit '34f82ca7332d2a148329128d773c328f5f48c3bc':
  Notification MessagingStyle: Add handset views

Change-Id: I3ca2689bd7de8fe13e6eca22bd562f7269801306
2016-04-12 22:40:41 +00:00
Shreyas Basarge
cd001c26da Merge "Merge "Documentation for flex field" into nyc-dev am: 997743d" into nyc-dev-plus-aosp
am: cbdbaad

* commit 'cbdbaadde6f9aaf5bd2cc016d3b4b1c9a5e16210':
  Documentation for flex field

Change-Id: Ic1faf3e0ed1f529cd579f83f65b9358b161331d2
2016-04-12 22:38:49 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a Merge "Documentation for flex field" into nyc-dev
am: 997743d

* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
  Documentation for flex field

Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
2016-04-12 22:21:00 +00:00
Adrian Roos
48d746ab32 Fix broken actions with MessagingStyle
Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
2016-04-12 15:00:31 -07:00
Mitchell Wills
91312c7cb2 Make WifiScanner state not static and use ConnectivityThread
Bug: 27432949
Change-Id: I3fa14b75ee6a48aea2bfb8fed662c37b678e3cf0
2016-04-12 20:59:24 +00:00
TreeHugger Robot
4db2f1f602 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 2016-04-12 20:12:41 +00:00
Shreyas Basarge
997743d29e Merge "Documentation for flex field" into nyc-dev 2016-04-12 19:35:21 +00:00
Adrian Roos
c1a80b08f0 Notification MessagingStyle: Add handset views
Bug: 27250207
Change-Id: I499cf2beaeeb34f0f189815fc0911f3b8954bd50
2016-04-12 11:52:49 -07:00
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
2016-04-12 17:29:39 +00:00
Alex Hills
06660697a3 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev
am: e3f3cb1

* commit 'e3f3cb10484260fac167e59d0178902a63ea7a6b':
  Fixes name of intent launch flag for Action Extender

Change-Id: Idbfc4beca1067031b9a7608930aa61779644901e
2016-04-12 17:24:10 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00