Commit Graph

66340 Commits

Author SHA1 Message Date
Android Build Merger (Role)
bd7d03ab6a Merge "Merge \"Address API council feedback (continued)\" into nyc-mr1-dev am: 01e51e59dd" into nyc-mr1-dev-plus-aosp 2016-06-30 00:01:11 +00:00
Makoto Onuki
88c6a3eaa3 Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
am: 01e51e59dd

Change-Id: Ia3a6d4eb224667956eebd6b935628a2ba40dfb18
2016-06-29 23:59:20 +00:00
Jeff Sharkey
38b322d171 Move getRecentTasks() to ParceledListSlice. am: 479212cf50
am: ce3c8ac0f4

Change-Id: Ie0c3873c46832d1a10b016bafb26e860eba4ec07
2016-06-29 23:59:09 +00:00
Jeff Sharkey
ce3c8ac0f4 Move getRecentTasks() to ParceledListSlice.
am: 479212cf50

Change-Id: Ifb3a5deacda0ff8b73469234d36f9cf711e616c2
2016-06-29 23:53:57 +00:00
Makoto Onuki
01e51e59dd Merge "Address API council feedback (continued)" into nyc-mr1-dev 2016-06-29 23:53:51 +00:00
Makoto Onuki
d6880797f7 Address API council feedback (continued)
Got a second set of comments.

Bug 29757958

Change-Id: Ib3a3ffd28bc3e35eb0218b0819870eb5c6ebadb5
2016-06-29 15:22:56 -07:00
Jeff Sharkey
479212cf50 Move getRecentTasks() to ParceledListSlice.
In extreme cases the list of recent tasks can grow beyond the size
of a single Binder transaction.  This change moves over to
ParceledListSlice which handles chunking any large results.

Bug: 29635557
Change-Id: Iaf1227234f5f8c9451f73a6a5c1dc89f2067f05f
2016-06-29 22:17:41 +00:00
Daniel Nishi
b8a7ddad7e Merge \"Use the Deletion Helper when system storage is low.\" into nyc-mr1-dev
am: 6401217532

Change-Id: I9d8645a32185a8749edeeee654ee81bdd00f240f
2016-06-29 21:47:05 +00:00
Daniel Nishi
6401217532 Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev 2016-06-29 21:37:07 +00:00
Dianne Hackborn
d229fdb1c7 Merge \\"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\\" into nyc-dev am: 205bc262ce
am: 381f4eb9be

Change-Id: I5cc4b41990cdf389e6e55f6891a87a9030a6d218
2016-06-29 20:51:33 +00:00
Dianne Hackborn
50beee8af9 Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce

Change-Id: I3d7186834028be519b512fbcb2240d2ff692f564
2016-06-29 20:50:52 +00:00
Dianne Hackborn
381f4eb9be Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce

Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
2016-06-29 20:45:36 +00:00
Alan Viverette
9d2328e57c Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am: c295a4b23d

Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688
2016-06-29 20:34:47 +00:00
TreeHugger Robot
c295a4b23d Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev 2016-06-29 20:31:03 +00:00
Rebecca Silberstein
62cb9dbf47 Merge changes from topic \'cherrypickWifiWatchdogResetOnTrigger\' into nyc-mr1-dev
am: b2f17f1bbb

Change-Id: Ic723498b7b486edd8f63822cb86127486a5c4657
2016-06-29 20:23:09 +00:00
Rebecca Silberstein
b2f17f1bbb Merge changes from topic 'cherrypickWifiWatchdogResetOnTrigger' into nyc-mr1-dev
* changes:
  DO NOT MERGE StateMachine: remove final from SendMessage
  DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD
2016-06-29 20:16:01 +00:00
Dianne Hackborn
1150b735c8 Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29 11:49:01 -07:00
Amith Yamasani
b61a5f1d64 Merge \"An API to check if running in a demo user\" into nyc-mr1-dev
am: b71081e4e9

Change-Id: Ie4e01ae963a86346acbc81d2ca5824ddefef8d20
2016-06-29 15:24:06 +00:00
Amith Yamasani
b71081e4e9 Merge "An API to check if running in a demo user" into nyc-mr1-dev 2016-06-29 15:18:34 +00:00
Hugo Benichi
17427c9770 Refactor IP connectivity event logging
am: cfddd68792

Change-Id: I8de880edc4a8c7f12527218788cb44f263acb56f
2016-06-29 07:18:28 +00:00
Hugo Benichi
cfddd68792 Refactor IP connectivity event logging
This patch removes static methods for logging IP connectivity events
defined in android.net.metrics and replaces them with a single log()
instance method defined on IpConnectivityLog. Event constructors are
now public also. Every classes logging such events now create an
instance of IpConnectivityLog for logging event objects directly
instantiated with new.

Removing static dependencies allow straightforward testing of logging.

This patch also removes the base IpConnectivityEvent class which is not
needed any more.

Bug: 29035129
Change-Id: I3de700f93f46deaa48a759f938f7d00e1d8bff98
2016-06-29 14:28:51 +09:00
Hugo Benichi
ca9a575a79 Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am: 41a3acc55a

Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2
2016-06-29 00:25:13 +00:00
Hugo Benichi
41a3acc55a Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
* changes:
  Add tests for MetricsLoggerService
  Tests for IpConnectivityMetricsLog
2016-06-29 00:15:49 +00:00
Amith Yamasani
1c41dc8ec5 An API to check if running in a demo user
Add an API to query if the calling app is running
in a demo user sandbox. This allows apps to customize
the starting experience to a potential customer.

Change-Id: I50e40f9a8c66da4b5672c1dc64606d7bedba3f8c
Fixes: 29833923
2016-06-28 17:05:19 -07:00
Rebecca Silberstein
0dbeb9e01a DO NOT MERGE StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development.  This allows tests to verify calls to
sendMessage and sendMessageDelayed.

Also fixed one checkstyle error with import order.

BUG: 28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
2016-06-28 16:07:23 -07:00
Felipe Leme
62e46e8899 Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am: c1374208e3\" into nyc-mr1-dev
am: b1400b142e

Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a
2016-06-28 20:53:43 +00:00
Todd Kennedy
c3575b2149 Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am: 23bc74a8d5

Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17
2016-06-28 20:53:40 +00:00
Android Build Merger (Role)
b1400b142e Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am: c1374208e3" into nyc-mr1-dev 2016-06-28 20:49:14 +00:00
Felipe Leme
2f285643bf Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
2016-06-28 20:48:51 +00:00
Felipe Leme
1cec26c69e Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
2016-06-28 20:48:51 +00:00
TreeHugger Robot
23bc74a8d5 Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev 2016-06-28 20:48:37 +00:00
TreeHugger Robot
c1374208e3 Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev 2016-06-28 20:45:40 +00:00
Alan Viverette
3c5a1c8124 Remove framework dependencies on Support* demos
Required on nyc-mr1-dev since support library branch was reset.

Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
(cherry picked from commit 80bf1f8a3c)
2016-06-28 19:26:36 +00:00
Todd Kennedy
e3cc3d8ad4 Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am: a98e3e3ede
am: a1066ed6c2

Change-Id: I58d97cd42bc939a91d00bd6189a1c2ffcc913b37
2016-06-28 19:22:25 +00:00
Todd Kennedy
a1066ed6c2 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
2016-06-28 19:16:40 +00:00
Todd Kennedy
08739a2778 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
2016-06-28 19:16:35 +00:00
Todd Kennedy
1f397f4e7b Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.

Bug: 29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
2016-06-28 12:14:11 -07:00
Felipe Leme
dd85da6e94 Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.

BUG: 29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
2016-06-28 11:34:54 -07:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
2016-06-28 10:31:05 -07:00
Dan Sandler
5643d0a5f8 One final tweak to the platlogo. am: 4b7e415803
am: 3fae8ae0c6

Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
2016-06-28 07:14:54 +00:00
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
2016-06-28 07:07:31 +00:00
Dan Sandler
d930306e13 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8
2016-06-28 07:07:22 +00:00
Dan Sandler
4b7e415803 One final tweak to the platlogo.
Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
2016-06-27 22:59:24 -04:00
Hugo Benichi
3bba249c47 Tests for IpConnectivityMetricsLog
Bug: 28204408
Bug: 29035129
Change-Id: I429562a00904188947b11da9928ec5c01296ff97
2016-06-28 11:43:03 +09:00
Svetoslav Ganov
dc162dde07 Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
am: 5f7f3fa7a9

Change-Id: Id4bc3ae0c1d79174a22d669dccab3391c231357d
2016-06-28 00:52:01 +00:00
Svet Ganov
5f7f3fa7a9 Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447
2016-06-28 00:46:58 +00:00
Svet Ganov
7878e736f7 Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c
2016-06-28 00:46:55 +00:00
Svet Ganov
ddb948896c Mark app pending intents in notification extras
We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.

bug:29480440

Change-Id: I7328a47017ca226117adf7054900836619f5679b
2016-06-27 17:32:25 -07:00
Andreas Gampe
bd2503e5f4 Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
am: d06f87399b

Change-Id: Iaefa3414cb7ca7d113e9ac776f8f667d5dc724c8
2016-06-28 00:00:13 +00:00
TreeHugger Robot
d06f87399b Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev 2016-06-27 23:50:37 +00:00