Commit Graph

62127 Commits

Author SHA1 Message Date
Hugo Benichi
88a9b54cdf Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev am: f5e3481951
am: 0664017da0

Change-Id: I75a518b8909e5cd85c7554ceaa11dc7519717075
2016-06-30 14:17:41 +00:00
Hugo Benichi
0664017da0 Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
am: f5e3481951

Change-Id: Ic853ff8e8e1745821627e796d22daea227bafca2
2016-06-30 14:12:13 +00:00
TreeHugger Robot
f5e3481951 Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
* changes:
  Record events for RA option lifetimes
  Log RA listening statistics
  Log events at APF program generation
2016-06-30 14:03:22 +00:00
Tobias Thierer
2df6976bb1 Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: a31247bd8d am: f6bcab7f97 am: 6b473f7b67
am: 847fe1668e

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a
2016-06-30 13:12:46 +00:00
Tobias Thierer
847fe1668e Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: a31247bd8d am: f6bcab7f97
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1
2016-06-30 13:04:52 +00:00
Tobias Thierer
6b473f7b67 Merge \\"Changes for upgrade to OkHttp 2.7.5\\" am: a31247bd8d
am: f6bcab7f97

Change-Id: I7a1c9838a22cb7e8228e77bde68283fda57c83d6
2016-06-30 12:59:22 +00:00
Tobias Thierer
f6bcab7f97 Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
2016-06-30 12:49:47 +00:00
Hugo Benichi
cfbf7414a1 Record events for RA option lifetimes
This patch defines a new android.net.metrics.RaEvent class carrying
lifetime values contained in RA packets. RaEvent are recorded when
ApfFilter processes a new RA for which there is no match.

Example:
ConnectivityMetricsEvent(15:39:39.808, 0, 0): RaEvent(lifetimes: router=3600s, prefix_valid=2592000s, prefix_preferred=604800s, route_info=-1s, dnssl=-1s, rdnss=3600s)

Change-Id: Ia28652e03ed442d5f2a686ef5b3fafbcb77c503a
2016-06-30 18:26:39 +09:00
Hugo Benichi
647c86d70a Log RA listening statistics
This patch adds a new ApfStats event class that counts RA packet
reception statistics on the RA listener thread of ApfFilter and reports
the maximum program size advertised by hardware.

Statistics are gathered for the lifetime of a network with APF
capabilities and uploaded at network teardown when the listener thread
exits.

Example event:
ConnectivityMetricsEvent(15:44:23.741, 0, 0): ApfStats(284945ms 2048B RA: 2 received, 0 matching, 0 ignored, 0 expired, 0 parse errors, 2 program updates)

Bug: 28204408
Change-Id: Id2eaafdca97f61152a4b66d06061c971bc0aba4c
2016-06-30 18:26:33 +09:00
Hugo Benichi
4fc3ee5be2 Log events at APF program generation
Example:
ConnectivityMetricsEvent(15:24:52.018, 0, 0): ApfProgramEvent(0/0 RAs 121B forever FLAG_MULTICAST_FILTER_ON)
ConnectivityMetricsEvent(15:24:53.036, 0, 0): ApfProgramEvent(1/1 RAs 334B 600s)
ConnectivityMetricsEvent(15:24:53.590, 0, 0): ApfProgramEvent(1/1 RAs 360B 600s FLAG_MULTICAST_FILTER_ON, FLAG_HAS_IPV4_ADDRESS)
ConnectivityMetricsEvent(15:24:58.157, 0, 0): ApfProgramEvent(1/1 RAs 294B 599s FLAG_HAS_IPV4_ADDRESS)

Bug: 28204408
Change-Id: I9c4c82861cf42eb2c7e7bf5471f05e8ff2fc560c
2016-06-30 18:21:09 +09:00
Ben Lin
008885228f Merge "Provider-level changes for implementing direct eject of a root in Files app." 2016-06-30 01:11:22 +00:00
Makoto Onuki
0ba4ec6b92 Merge \"Merge \\"Address API council feedback (continued)\\" into nyc-mr1-dev am: 01e51e59dd\" into nyc-mr1-dev-plus-aosp
am: bd7d03ab6a

Change-Id: I4a2dd860bdf4ebdcc6ab420d162579307734fa6f
2016-06-30 00:14:24 +00:00
Jeff Sharkey
0f5130bd95 Move getRecentTasks() to ParceledListSlice. am: 479212cf50 am: ce3c8ac0f4
am: 38b322d171

Change-Id: Id28e985eff80210d5f25d8632db1e98fd111b896
2016-06-30 00:03:54 +00:00
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
Android Build Merger (Role)
9f22e79625 Merge "Move getRecentTasks() to ParceledListSlice. am: 479212cf50" into nyc-mr1-dev 2016-06-29 23:54:27 +00:00
Jeff Sharkey
3362400aa5 Move getRecentTasks() to ParceledListSlice.
am: 479212cf50

Change-Id: Ic76f624396117d922aac60eac9c2caae4f1d7e27
2016-06-29 23:53:58 +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
Ben Lin
e7822fb767 Provider-level changes for implementing direct eject of a root in Files app.
Several changes at different levels:
1. Introduction of ejectRoot(String) for DocumentsProvider
2. Introduction of ejectRoot(ContentResolver, Uri, String) for
DocumentsContract
4. Additional permission for MOUNT_UNMOUNT for ExternalStorageProvider
5. Implementation of ejectRoot(String) for External StorageProvider

Bug: 29584653
Change-Id: I28557af63259548784cf24d5b051eb06ad5193ca
(cherry picked from commit 2ccc18357d6741dde56edc4d5a2608f15f4b9078)
2016-06-29 23:06: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
Roozbeh Pournader
875446698c Merge "Get failing WordIterator unit tests to pass again" 2016-06-29 22:03:29 +00:00
Daniel Nishi
f06f1b8180 Merge \\"Use the Deletion Helper when system storage is low.\\" into nyc-mr1-dev am: 6401217532
am: b8a7ddad7e

Change-Id: I3d51bb6934e4a42ec8e9d7f37d460b780a5941fe
2016-06-29 21:54:10 +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
4aba72c6c8 Merge \\\"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\\\" into nyc-dev am: 205bc262ce am: 381f4eb9be
am: d229fdb1c7

Change-Id: Idc70c2c5893ac586cc192ea75fe04fdab421e851
2016-06-29 21:34:02 +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
Roozbeh Pournader
9dad5811d7 Get failing WordIterator unit tests to pass again
WordIterator is now following the pattern in java.text.BreakIterator,
throwing an IllegalArgumentException when receiving an invalid argument.
Previously, it failed inconsistently.

Also add @SmallTest annotations to the WordIterator tests.

Bug: 29868991
Change-Id: I8158f2f419c8c4467205031655c0e62cc9ef5c1c
2016-06-29 13:14:13 -07:00
Sanket Agarwal
40bb6f3f8f Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
2016-06-29 18:58:09 +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
Derek Sollenberger
c63d24868c Merge "Remove isAvailable() from DisplayListCanvas." 2016-06-29 17:15:14 +00:00
Tobias Thierer
851d806dbd Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
2016-06-29 17:41:32 +01:00
Amith Yamasani
96c0bc2eb9 Merge \\"An API to check if running in a demo user\\" into nyc-mr1-dev am: b71081e4e9
am: b61a5f1d64

Change-Id: I3e4e57997ecf942d0607628529f0bf97f4c1d2ce
2016-06-29 15:29:22 +00: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
Derek Sollenberger
f64c34e73f Remove isAvailable() from DisplayListCanvas.
The method has been moved to ThreadedRenderer and the native
implementation has been renamed to better reflect its intent.

Change-Id: I7ee6d578ad0c2ee20111edd424c7560a449f0b39
2016-06-29 08:25:06 -04:00
Hugo Benichi
186e5b57d3 Refactor IP connectivity event logging am: cfddd68792
am: 17427c9770

Change-Id: If8775031f2a293e94e564dde502d0775d5808fe6
2016-06-29 07:23:19 +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
Siyamed Sinir
24ae4b6d1b Merge "Fix bidi desired width calculation" 2016-06-29 01:42:34 +00:00
Hugo Benichi
21b6b821df Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev am: 41a3acc55a
am: ca9a575a79

Change-Id: I948403eb8ff92b2de87d8ce402921b3ede7e0b82
2016-06-29 00:30:17 +00: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