Commit Graph

1268 Commits

Author SHA1 Message Date
Robert Greenwalt
c4e25b26de Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
  Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
2016-06-03 16:44:29 +00:00
Robert Greenwalt
37409c5747 Add support for UNSOL PCO Data.
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
2016-06-02 15:21:59 -07:00
Dirk Dougherty
48d8747041 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104
am: 4569e9515c

* commit '4569e9515c651616f7e24f563b52de98fb4bf258':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I83d230df7e8fb620ec9ea57621492261fbb236b7
2016-05-02 19:39:03 +00:00
Dirk Dougherty
4569e9515c Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c
am: c25a9b0104

* commit 'c25a9b0104802454487ee6c428f9f070d389c02f':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: Ib8ff6165cbcb1d3fb52611e9f5e61ac69a0083b6
2016-05-02 19:34:34 +00:00
Dirk Dougherty
c25a9b0104 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264
am: 6049306d8c

* commit '6049306d8c0f88f78dbc097bfcc971b095c6a9a3':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I6b6a65147254b0d2ba5ec6aa52429819ddca9b77
2016-05-02 19:29:22 +00:00
Dirk Dougherty
dfa366dccf Pass -yaml to ds builds to generate _book.yaml version of reference TOC.
Change-Id: I1eced1670eb9d7892672b59f3b92833448b9949a
2016-04-29 18:06:11 -07:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
Dirk Dougherty
a2fcd056a9 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev
am: 58a252d

* commit '58a252d1f0048c8b4188f6ea87d072cb3a686a50':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: I0812cf024502b32259bd4431324e91d8fcf5e792
2016-04-27 21:20:57 +00:00
Dirk Dougherty
d9036ba7ef resolve merge conflicts of 0d00d28 to nyc-dev
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9
2016-04-27 10:44:43 -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
Dirk Dougherty
0d00d287a5 Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs am: face65fe16
am: eeee5e2

* commit 'eeee5e2ec980f67b92597b7f5d8828593b3692aa':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: Id3d33d84e7127bc8cab0cdd4ccbc3505bfb2c824
2016-04-26 08:51:53 +00:00
Svet Ganov
70d720ca72 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b
2016-04-22 22:24:36 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Sujith Ramakrishnan
de3f4aead5 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev
am: 7981e8f

* commit '7981e8ff6509769a590f15b440f989437d732be5':
  Unbundle RemoteService on TV - part 3

Change-Id: Ib5eb6363e904a1f66000d12263f66a8e5bd1f663
2016-04-22 21:02:04 +00:00
Sujith Ramakrishnan
b5b86c1100 Unbundle RemoteService on TV - part 3
- New service TVRemoteService triggered by SystemServer
- Provider service proxy and watcher for maintaining connections to unbundled
  services which have the BIND_TV_REMOTE_SERVICE permission.
- Shared library to facilitate connections between unbundled service and
  TVRemoteService.
- Unbundled service needs TV_VIRTUAL_REMOTE_CONTROLLER
  permission to be fully functional.

b/23792608

Change-Id: Ief5c6995883d1f7268a73bdd0c920c4c3f42cddb
2016-04-22 12:21:34 -07:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00
Robin Lee
e7c7d77f6f Merge "Move UidRange aidl declaration to system/netd" into nyc-dev
am: c618468

* commit 'c6184685d8f9b08abf73f83778ca129bb5c9c51d':
  Move UidRange aidl declaration to system/netd

Change-Id: I708ee20cfef47252a4b3ebecd1b2d46886326af4
2016-04-19 19:28:07 +00:00
Robin Lee
c6184685d8 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev 2016-04-19 19:19:43 +00:00
Robin Lee
106069412d Move UidRange aidl declaration to system/netd
Which owns the native UidRange.cpp, so it makes more sense for the
declaration to live there since frameworks/base depends on netd but not
vice versa.

Bug: 26694104
Change-Id: I0efda77713ee6f0ec8070fb0e09a694b95f6cd25
2016-04-18 15:26:47 +01:00
Martijn Coenen
d55def8924 Fix API review comments, add remove callback.
Bug: 28148561
Bug: 26426491
Change-Id: I5917ea5d8fe0d3195b407643ec271ab4eb8b30b7
2016-04-15 22:14:07 +02:00
Pavel Zhamaitsiak
5b2e5316d8 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev
am: 0a97f22

* commit '0a97f22e068aeffd7384f64d26ab922b6d15670f':
  Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: I02d01abb811fc309024fb04fb5f56207a441a478
2016-04-14 01:01:29 +00:00
TreeHugger Robot
0a97f22e06 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev 2016-04-14 00:52:36 +00:00
Dirk Dougherty
3852c1fd01 Adjust root path for translated content dirs on devsite builds.
Change-Id: I26e8cfcc60c113574a2807bf6fff7913c7d3823d
2016-04-10 02:07:35 -07:00
Ruben Brunk
bc783e038c Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev
am: 50e229f

* commit '50e229f1f45a1550ba13ec3f81e864630fc3dc1c':
  Add VrManager AIDL interface for use by system apps.

Change-Id: Ia0bbf2bbe778bef5773e5d7c43b25d3cb248fe23
2016-04-06 21:42:17 +00:00
Ruben Brunk
c7be3beced Add VrManager AIDL interface for use by system apps.
Bug: 27884853
Change-Id: I6de0d291deafe5003070d60866c60d6599312e79
2016-04-06 12:29:40 -07:00
Trevor Johns
a5060ee80d Merge branch 'mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	docs/html-intl/intl/es/index.jd
	docs/html-intl/intl/es/preview/download.jd
	docs/html-intl/intl/es/preview/index.jd
	docs/html-intl/intl/ja/index.jd
	docs/html-intl/intl/ja/preview/download.jd
	docs/html-intl/intl/ja/preview/index.jd
	docs/html-intl/intl/ko/index.jd
	docs/html-intl/intl/ko/preview/download.jd
	docs/html-intl/intl/ko/preview/index.jd
	docs/html-intl/intl/pt-br/index.jd
	docs/html-intl/intl/pt-br/preview/download.jd
	docs/html-intl/intl/pt-br/preview/index.jd
	docs/html-intl/intl/ru/index.jd
	docs/html-intl/intl/ru/preview/download.jd
	docs/html-intl/intl/ru/preview/index.jd
	docs/html-intl/intl/zh-cn/index.jd
	docs/html-intl/intl/zh-cn/preview/download.jd
	docs/html-intl/intl/zh-cn/preview/index.jd
	docs/html-intl/intl/zh-tw/index.jd
	docs/html-intl/intl/zh-tw/preview/download.jd
	docs/html-intl/intl/zh-tw/preview/index.jd
	docs/html/guide/topics/manifest/compatible-screens-element.jd
	docs/html/guide/topics/manifest/uses-feature-element.jd
	docs/html/preview/download.jd
	docs/html/preview/features/runtime-permissions.jd
	docs/html/sdk/index.jd
	docs/html/tools/revisions/studio.jd
	docs/html/tools/sdk/eclipse-adt.jd
	docs/html/tools/support-library/features.jd
	telephony/java/android/telephony/TelephonyManager.java

Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
2016-04-05 20:32:07 -07:00
Pavel Zhamaitsiak
0fb0731358 Delete ITelephonyDebug and ITelephonyDebugSubscriber
Bug: 28026463
Change-Id: Iee9010dd7352bafcffb5718293f8d71f2fd98ea9
2016-04-05 16:18:03 -07: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
c2f612e048 Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3
Change-Id: I84953dc077a5dfea1290b952e2de73f9a6d34118
2016-03-31 10:55:46 -07: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
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
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
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
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
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