1254 Commits

Author SHA1 Message Date
Pavel Zhamaitsiak
60aa10869c Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev am: f8565cd
am: faa0492

* commit 'faa0492d6ba7e9262741c50695997c6c231023e4':
  ConnectivityMetricsLogger: Switch to "pull" model

Change-Id: Ia5b0fde3c46bb34e8c2308eb8c7ec8af4d600558
2016-04-05 04:39:19 +00:00
Pavel Zhamaitsiak
faa0492d6b Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev
am: f8565cd

* commit 'f8565cd3f30c60d8343dae3ca8c8bca18c5b451a':
  ConnectivityMetricsLogger: Switch to "pull" model

Change-Id: Ic01fa847282f4d8b37c85c1b877a85df73401200
2016-04-05 04:34:50 +00:00
Pavel Zhamaitsiak
ce13079ab3 resolve merge conflicts of 20ebbb3 to nyc-dev
Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df
2016-04-04 17:42:05 -07:00
Pavel Zhamaitsiak
20ebbb3349 Merge "ConnectivityMetricsLogger: Switch to "pull" model" into mm-wireless-dev 2016-04-05 00:13:18 +00:00
Pavel Zhamaitsiak
d1cb256b3e ConnectivityMetricsLogger: Switch to "pull" model
If subscriber is in external app, its process can be killed. This would
lead to loss of events. To avoid that, we will be storing events in the
logger service. Clients can periodically pull data from it.

Another option for client apps is to register PendingIntent which will be
sent when certain number of new events has been received.

If events are logged at unexpectedly high rate from particular component,
then throttling mechanism will activate and new events will be blocked for
some time from that component.

Change-Id: I710409626eb5a42bcd3fe8126eac6b756fa1ab8b
2016-03-31 18:43:14 -07:00
Ying Wang
292dbde7a5 Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp
am: e7965d4

* commit 'e7965d4a22492a947462c62b99e8db9f41d497ff':
  Remove support of disabling Jack.

Change-Id: I067b7f2d3290948e3fcf656a596645f804a3803b
2016-03-31 18:08:07 +00:00
Ying Wang
c2f612e048 Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3
Change-Id: I84953dc077a5dfea1290b952e2de73f9a6d34118
2016-03-31 10:55:46 -07:00
Philip P. Moltmann
ddea724b36 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0
am: fa04bc7

* commit 'fa04bc7a5d49415bc7cd397bb9678316d3824f85':
  Add the print service recommendation service

Change-Id: I3da289dfe99e1caa3ed2ab3368902d597f16f738
2016-03-31 02:23:16 +00:00
Philip P. Moltmann
fa04bc7a5d Merge "Add the print service recommendation service" into nyc-dev
am: 740a5f0

* commit '740a5f023eea7b2fdb3e31efe8b8d5ac18aa8302':
  Add the print service recommendation service

Change-Id: Ie58ade9356f591781496581259b6d8a876780ac9
2016-03-31 02:17:26 +00:00
Philip P. Moltmann
9dcb86a48d Add the print service recommendation service
This service connects through the print manager to the print spooler:

PrintSpooler.AddPrintersActivity <-> PrintManager <-> PrintManagerService <-> UserState <-> RemotePrintServiceRecommendationService <-> PrintRecommendationService <-> PrintRecommendationServiceImpl

Hence there is a lot of mindless plumming.

The actual changes are only in the AddPrintersActivity which is extended
to show another list of services: The recommended services.

The PrintServiceRecommendationService is based on the experimenal print
service stubs provider. This provider was contributed the Android by
Mopria. As this services uses Android own network discovery service most
code from the experimental provider goes away. In fact the only logic
left over is the selections of mdns-txt fields to look at and the
printer vendor configuration.

This relies on the Android MDNS to get fixed (Bug: 27696905). This also
does not deal with how to update the recommendation service.

Bug: 24533249
Change-Id: I6edc6e25fc08a50d478b61c71bb8ea158b08624c
2016-03-30 17:21:07 -07:00
Ying Wang
ba068f4872 Remove support of disabling Jack.
Also removed obsolete LOCAL_DX_FLAGS.

Bug: 27400061
Change-Id: I23fe13927fb3580698a8a4b84173e229e037f02e
2016-03-30 13:58:10 -07:00
Joe Onorato
df1f2c5205 Merge "Refactor ProcessStats." into nyc-dev am: 0caf007
am: ee93672

* commit 'ee93672b78a8054713f340ef07a512d86e6db5cc':
  Refactor ProcessStats.
2016-03-28 21:17:56 +00:00
Joe Onorato
ee93672b78 Merge "Refactor ProcessStats." into nyc-dev
am: 0caf007

* commit '0caf007b3f0b4cd21be285820c270c51a8e502b7':
  Refactor ProcessStats.
2016-03-28 21:06:08 +00:00
Joe Onorato
0caf007b3f Merge "Refactor ProcessStats." into nyc-dev 2016-03-28 20:52:39 +00:00
Jeff Sharkey
3c664a9b39 Update PRE_BOOT_COMPLETED for FBE. am: bd91e2f
am: bef5aad

* commit 'bef5aad065fd2f5f222ac14a8d063d12348c7c34':
  Update PRE_BOOT_COMPLETED for FBE.
2016-03-27 17:50:04 +00:00
Jeff Sharkey
bef5aad065 Update PRE_BOOT_COMPLETED for FBE.
am: bd91e2f

* commit 'bd91e2f3f6aca512a02be645b2515b5e3331e177':
  Update PRE_BOOT_COMPLETED for FBE.
2016-03-27 17:47:15 +00:00
Jeff Sharkey
bd91e2f3f6 Update PRE_BOOT_COMPLETED for FBE.
Now that CE data isn't available until after a user is unlocked, we
need to delay the PRE_BOOT_COMPLETED broadcasts.  This is done by
adding a new RUNNING_UNLOCKING user state to the UserController
lifecycle.

We now track the last fingerprint a user was logged in under, and we
dispatch PRE_BOOT receivers when that fingerprint changes.  To work
around battery pull issues, we only persist the updated fingerprint
once all PRE_BOOT receivers have finished.  This is less granular
than the original solution, but it's still correct.  We only consider
a user as "logged in" once it transitions into the RUNNING_UNLOCKED
state.

When starting a process, track if the user was "unlocked" when
started, so that we only spin up unaware providers in processes
started before user unlock.

Add generic IProgressListener to communicate PRE_BOOT progress and
strings up to lock screen.  For now, LockSettingsService just blocks
until finished, but it could display these strings in the future.

Bug: 27220885
Change-Id: I349439776b885acd32f6a578d8951ffd95640be2
2016-03-27 10:56:48 -06:00
Joe Onorato
4eb64fdbcf Refactor ProcessStats.
- Pull most of the inner classes out into their own files.
- Move everything to a new android.app.procstats package.
- Move all of the code that was manipulating the big list
  of longs to use the new SparseMappingTable class rather
  than doing everything by hand. The logic is unchanged.
- Add a sequence number check to SparseMappingTable so
  when the big list of longs and the individual tables are
  reset, which happens somewhat independently, we can
  assert when one of them doesn't get reset.
2016-03-24 15:55:31 -07:00
Dan Willemsen
cceedf75c4 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp
am: dc3b852

* commit 'dc3b8521256eaec189e8dd6335df40fd2493adb1':
  Remove custom copy rules, stop using ACP
2016-03-23 22:40:16 +00:00
Dan Willemsen
dc3b852125 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp
Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
2016-03-23 15:31:32 -07:00
Dan Willemsen
98ff0b72f0 Remove custom copy rules, stop using ACP
Replace some custom rules with BUILD_PREBUILT.

Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.

Remove uses of ACP and replace with core build system macros or 'cp'

Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141
2016-03-23 13:42:52 -07:00
smain@google.com
6c254f09a2 Merge "switch offline docs back to standard templates that now have a condition for \'referenceonly\' bug: 27667787" into nyc-dev am: 1dd114e
am: 24b8e43

* commit '24b8e43f699e5c4baa5116542c8723b3997fe389':
  switch offline docs back to standard templates that now have a condition for 'referenceonly' bug: 27667787
2016-03-22 23:14:51 +00:00
Scott Main
1dd114e5ab Merge "switch offline docs back to standard templates that now have a condition for 'referenceonly' bug: 27667787" into nyc-dev 2016-03-22 23:05:39 +00:00
smain@google.com
f7b6dad015 switch offline docs back to standard templates that now have a condition for 'referenceonly'
bug: 27667787

Change-Id: Iaedba58c72634dac33ef09b9a50322af664ef581
2016-03-22 14:20:25 -07:00
Pavel Zhamaitsiak
bb6d60a114 Merge "ims:rcs: Add UCE interface files for RCS." into nyc-dev am: eac4de2
am: b487726

* commit 'b4877263b14f34e96bcf3b4e08e52f46fbba9228':
  ims:rcs: Add UCE interface files for RCS.
2016-03-19 00:27:08 +00:00
Dheeraj Shetty
7ed3044ed1 ims:rcs: Add UCE interface files for RCS. [DO NOT MERGE]
Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
2016-03-19 00:22:59 +00:00
Pavel Zhamaitsiak
cfedd20d54 ims:rcs: Add UCE interface files for RCS.
Bug: 23222011
Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
2016-03-18 16:09:50 -07:00
Michal Karpinski
8f8e9e3d99 Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev am: c7605b83
am: e165d40

* commit 'e165d40d2d03cde6f8ed8da523b65553de800906':
  Unifying method names and comments to security logging, not device logging
2016-03-17 19:09:08 +00:00
Michal Karpinski
6235a94ffa Unifying method names and comments to security logging, not device logging
Also move SecurityLog to android.app.admin package.

Bug: 27531824
Bug: 27532560
Bug: 27532564
Bug: 27532425
Change-Id: I2677afdb5685bc5d21e52c41b381b57a41e364b6
2016-03-16 14:32:09 +00:00
Joseph Pirozzo
2d738af372 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev am: d91859d246
am: f12a22cd53

* commit 'f12a22cd538844afa5fc5ed809febe2c4e2badbd':
  Add BluetoothProfile for PBAP PCE role.
2016-03-15 23:30:30 +00:00
Joseph Pirozzo
d91859d246 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev 2016-03-15 23:21:12 +00:00
Joseph Pirozzo
cfa8a64694 Add BluetoothProfile for PBAP PCE role.
Create a new Bluetooth profile for Pbap Client.

Bug: 27490041
Change-Id: I77d2c7eeeb8e955ea61386d784b02b14f415b318
2016-03-14 17:02:16 -07:00
Anju Mathapati
b35d57aad9 Merge "IMS: Changes for MultiEndpoint" into nyc-dev am: f8de70c7b7
am: 8391d839bb

* commit '8391d839bb508be6c21a154f67a9423169e376b0':
  IMS: Changes for MultiEndpoint
2016-03-14 17:59:11 +00:00
Tyler Gunn
f8de70c7b7 Merge "IMS: Changes for MultiEndpoint" into nyc-dev 2016-03-14 17:48:11 +00:00
Anju Mathapati
f604fc33c6 IMS: Changes for MultiEndpoint
- Interface changes for MultiEndpoint

- Extra for CallPull in -
  - TelephonyProperties
  - ImsProfile
- Error codes in ImsReasonInfo

Change-Id: I9a497cf04a412dc9d2f80b489e3455d289c3dfb7
2016-03-11 16:08:06 -08:00
Joe Fernandez
a2fbe47d64 Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev am: 093889409b
am: 60d139cc09

* commit '60d139cc09fb8d76f12fd1ce9d02647ff6db03b6':
  docs: Fix reference docs build to indicate N changes
2016-03-11 04:57:12 +00:00
Joe Fernandez
093889409b Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev 2016-03-11 04:50:19 +00:00
smain@google.com
772d08f990 Merge "fix the docs preview version number" into nyc-dev am: a0d9165ff6
am: 950600b4ac

* commit '950600b4ac7e690cdf2bc2ddd55c9a6d3ae4315c':
  fix the docs preview version number
2016-03-10 23:51:36 +00:00
smain@google.com
269aa4ebc4 fix the docs preview version number
Change-Id: I8c8a8fb6bd431eade40e62a6b135b628811c0558
2016-03-10 15:37:58 -08:00
smain@google.com
a1d14c9c3c Merge "update preview version number to 2 for offline docs" into nyc-dev am: 89dd1c43f0
am: 58ffc3163d

* commit '58ffc3163df6694e4035c3ba66a147f94025bbd7':
  update preview version number to 2 for offline docs
2016-03-10 23:25:06 +00:00
smain@google.com
42fa6ee187 Merge "make new \'referenceonly\' docs build the default for offline docs. add preview codename and version number HDF variables for generated docs." into nyc-dev am: 5904f246ca
am: bdf6f6b89a

* commit 'bdf6f6b89a715f3c0534ffd672460b955875575e':
  make new 'referenceonly' docs build the default for offline docs. add preview codename and version number HDF variables for generated docs.
2016-03-10 23:25:06 +00:00
smain@google.com
9334f5ed12 update preview version number to 2 for offline docs
Change-Id: I56cab8d21f9521fab17ec79a441c518cf9da536c
2016-03-10 15:13:28 -08:00
smain@google.com
7aca8beaa8 make new 'referenceonly' docs build the default for offline docs.
add preview codename and version number HDF variables for generated docs.

Change-Id: I165526f4e575ec8885bab906e66d17666ea8b4ba
2016-03-10 15:01:36 -08:00
smain@google.com
0ff9bf7cc9 udpate refonly doc build to include new landing page for dev preview. am: 278fb0deb2
am: 0be6038f99

* commit '0be6038f99772a45fb09759ba1ca99576e4af28a':
  udpate refonly doc build to include new landing page for dev preview.
2016-03-10 18:17:59 +00:00
smain@google.com
753068ba81 Merge "cherrypick I4e1ca9fddc6374fd80108e4f9a3b9745f8598507 add new make target for offline docs with only the API reference. Also update the default index.html landing page to redirect to the reference." into nyc-dev am: b907ff764a
am: 76576fad9a

* commit '76576fad9a98e12e36213bc83808cd6eb540d20d':
  cherrypick I4e1ca9fddc6374fd80108e4f9a3b9745f8598507 add new make target for offline docs with only the API reference. Also update the default index.html landing page to redirect to the reference.
2016-03-10 18:12:06 +00:00
smain@google.com
278fb0deb2 udpate refonly doc build to include new landing page for dev preview.
Change-Id: I088425ed1549dd3bae6a5a755884eb4c3cb0af4f
(cherry picked from commit aa6aa2929c546289c873b3d019de4616c2ddc620)
2016-03-10 18:07:38 +00:00
smain@google.com
00de8c5d7a cherrypick I4e1ca9fddc6374fd80108e4f9a3b9745f8598507
add new make target for offline docs with only the API reference.
Also update the default index.html landing page to redirect to the reference.

Change-Id: I2a123e49e2d6bb365bd81383ca3a9fc8e03de034
2016-03-09 16:57:56 -08:00
Joe Fernandez
89f385d537 docs: Fix reference docs build to indicate N changes
Change-Id: I4cd64a0452e97aa87a86fffd1c9f9ba3d99eb5c3
(cherry picked from commit f6c304579d673135e0df23f887aa068fb91db0f3)
2016-03-09 15:28:34 +00:00
Makoto Onuki
af00108ca4 resolve merge conflicts of 1ca3800c44 to master
Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6
2016-03-08 10:39:25 -08:00
Makoto Onuki
ed58f5f0aa Merge "Introducing ShortcutManager" into nyc-dev 2016-03-08 18:01:05 +00:00