1637 Commits

Author SHA1 Message Date
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
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +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
Sujith Ramakrishnan
fa5a632067 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3
am: c5826ee

* commit 'c5826eebc50a6ffafe8cd20633b01b6ca27e8490':
  Unbundle RemoteService on TV - part 3

Change-Id: If0dabbb8199132648fa9a791f46ee85e8970eb4b
2016-04-22 21:36:53 +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
c5826eebc5 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f
am: a2262b3

* commit 'a2262b3bb15497c6ee4854cfcf7a43fc07c2c876':
  Unbundle RemoteService on TV - part 3

Change-Id: I45fbdda42aa5d9f5d9c25a027dd11eb7b0f560a1
2016-04-22 21:04:43 +00: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
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
2016-04-21 21:48:10 +00: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
e1ee098ab2 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 am: e7c7d77
am: 5d16439

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

Change-Id: I899574d6e8ec88049a8bb72e8dc451ebd407bc3a
2016-04-19 19:34:50 +00: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
TreeHugger Robot
1d03aedd7d Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev am: 0a97f22
am: 5b2e531

* commit '5b2e5316d87227cce9e6e5054d98dfd7c60602ac':
  Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: Ie392d4d5baafc25a8384f4cdb0b9306bce26d031
2016-04-14 18:38:50 +00: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
4a49791ef9 Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev am: 50e229f
am: bc783e0

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

Change-Id: Ie3aaad8ef509f69c643638f8974a95e1f33a7a60
2016-04-06 21:44:55 +00: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
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