Commit Graph

65452 Commits

Author SHA1 Message Date
Jakub Pawlowski
f8b8f56b73 Merge "GATT Server refactoring (2/4)" am: d13954e8c6
am: fe4b1e47fc

Change-Id: Id4a88b39102b3acbc09e203e09637c40ae81bb89
2016-08-03 13:05:48 +00:00
Jakub Pawlowski
fe4b1e47fc Merge "GATT Server refactoring (2/4)"
am: d13954e8c6

Change-Id: I10383d95f79409282d96ae60b294c72754df5641
2016-08-03 12:59:24 +00:00
Jakub Pawlowski
d13954e8c6 Merge "GATT Server refactoring (2/4)" 2016-08-03 10:21:44 +00:00
John Stultz
55b3a9ceb3 Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3
am: 5e23ab394a

Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa
2016-08-03 00:17:56 +00:00
John Stultz
5e23ab394a Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am: 1085be0ce3

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
2016-08-03 00:12:32 +00:00
Treehugger Robot
1085be0ce3 Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" 2016-08-03 00:04:19 +00:00
Jakub Pawlowski
d75f512aa2 GATT Server refactoring (2/4)
Bug: 27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588
2016-08-02 20:45:06 +00:00
Fyodor Kupolov
dbf07bb8ef Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3
am: bc8d946e09

Change-Id: I6ab069a0e02e6b1053dafe98671ab68ef99ff527
2016-08-01 17:50:09 +00:00
Hidehiko Tsuchiya
bc8d946e09 Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
am: 3e151273a3

Change-Id: Ic06ade3ce6dd795e7d12cfba150286933512433d
2016-08-01 17:43:30 +00:00
Hidehiko Tsuchiya
5acd41d155 Fix the API compatibility of "UriMatcher#addURI"
The previous patch (ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.

Bug: 29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
2016-07-30 01:47:50 +00:00
John Stultz
5733f387be Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms
The when the timerfd alarm logic was added to the kernel, an oversight was made
and the interface does not check for the CAP_WAKE_ALARM permissions as required
via other kernel methods to trigger an alarm timer.

In v4.8-rc kernels, the change 2895a5e5b3a ("timerfd: Reject ALARM timerfds
without CAP_WAKE_ALARM") was added by Eric Caruso <ejcaruso@google.com>.

After this change (which may be backported to -stable), the AlarmManager will
fail on the first timerfd_create call, and will not be able to set the time
or handle other necessary functions.

The solution here is to add CAP_WAKE_ALARM to the system_server process.

Change-Id: Ifdb16f3ef42711e553f727165de3922d484b5be4
Signed-off-by: John Stultz <john.stultz@linaro.org>
2016-07-28 12:41:04 -07:00
Kevin Hufnagle
b73cdcefcc Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe
am: 55b52a2b3f

Change-Id: Ib14b352efe5f10043b092e234a2b92f2c2aa2bc2
2016-07-20 01:29:00 +00:00
Kevin Hufnagle
55b52a2b3f Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52
am: b9487874fe

Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
2016-07-20 01:20:20 +00:00
Kevin Hufnagle
b9487874fe Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d
am: a812012c52

Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
2016-07-20 01:12:40 +00:00
Kevin Hufnagle
d312201b74 Merge "docs: Updated descriptions of device orientation angles." into mnc-docs 2016-07-20 00:45:09 +00:00
Felipe Leme
bc84c54a2b Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am: 24b2e7bbee

Change-Id: I7920617a1506817b25ade8e92bfb1945d2f173bb
2016-07-14 18:23:34 +00:00
Felipe Leme
24b2e7bbee Merge "Fixed statuses on Battery Saver column." into nyc-dev 2016-07-14 18:10:56 +00:00
Felipe Leme
9e325706f4 Fixed statuses on Battery Saver column.
BUG: 30139400

Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
2016-07-14 11:04:49 -07:00
Adam Lesinski
165e9d92b2 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
2016-07-14 01:50:52 +00:00
Adam Lesinski
e60064ab3c Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.

crbug.com/627586

Bug:30118654

Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-14 00:22:12 +00:00
Vladislav Kaznacheev
8496bb82d2 Fix docs for View.DRAG_FLAG_GLOBAL
am: 9a44eaec53

Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50
2016-07-13 00:08:52 +00:00
Vladislav Kaznacheev
9a44eaec53 Fix docs for View.DRAG_FLAG_GLOBAL
Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177
2016-07-12 15:24:48 -07:00
Amith Yamasani
c6b85035b4 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7
2016-07-12 17:47:05 +00:00
Amith Yamasani
e278cf7665 Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev 2016-07-12 17:40:13 +00:00
Vladislav Kaznacheev
879b3fb9ce Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I33c231d19065a5acc26472d4c3f175351d2a6d10
2016-07-11 23:26:05 +00:00
TreeHugger Robot
b6fa207c67 Merge "Fix docs for DragEvent" into nyc-dev 2016-07-11 23:17:42 +00:00
Amith Yamasani
75db125ebb Include new constant for encryption status in the getter's javadoc
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.

Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719
2016-07-11 15:02:18 -07:00
Vladislav Kaznacheev
3067bc69d9 Fix docs for DragEvent
Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1
2016-07-11 13:52:22 -07:00
Mark Lu
e67f00705f Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: Ifb20f4b32ec6a6972a5ee1f832d91e1c169bb543
2016-07-11 20:20:39 +00:00
Mark Lu
162a6fad72 Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev 2016-07-11 20:13:47 +00:00
Svet Ganov
8503bf31bf Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: If7706e1286847e02df34b6fce48c8de99b726d7d
2016-07-06 22:17:03 +00:00
Svet Ganov
51b839544b Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Felipe Leme
620936768f Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am: a98e4512df

Change-Id: Ibfa5a20731caae48c7961ab0452a72d7bff34cf0
2016-06-30 23:37:13 +00:00
Svetoslav Ganov
a98e4512df Merge "Removed warning when objects are added on wrong order." into nyc-dev 2016-06-30 23:28:59 +00:00
Felipe Leme
7709041c99 Removed warning when objects are added on wrong order.
append() is used to optimized insertions in the array, but it must
preserve the order of the hashcode array; when it doesn't, it falls back
to append(), but it should not log a warning message

In particular, PendingIntentRecords might have different hashcodes
across different processes.

Fixes: 29912192
Change-Id: I0ab566249829ddb934fd51cf21399b68cb286bd5
2016-06-30 23:19:08 +00:00
Adrian Roos
1b7dbd9253 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d
2016-06-30 23:07:40 +00:00
Adrian Roos
9dfb78fab6 Fix missing header text in notification groups
Fixes a case where notification header text could go missing
if a notification view was recycled and previously had a header text.

Reapplying only hid the text without clearing it, so the extraction
logic thought it was still there and hid the text for the children
even though it was not showing for the parent.

Change-Id: I3f96e1e7bebb2f815020d278ad13b2b5d948e63c
Fixes: 29915184
2016-06-30 15:46:15 -07:00
Alan Viverette
bf91103763 Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb
2016-06-30 17:36:00 +00:00
Alan Viverette
4b736ea56d Merge "Only clip PopupWindow in the vertical direction" into nyc-dev 2016-06-30 17:24:22 +00:00
Alan Viverette
176f9cb656 Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82
2016-06-30 17:19:43 +00:00
Alan Viverette
9705fa0602 Only clip PopupWindow in the vertical direction
Bug: 29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
2016-06-30 13:17:26 -04:00
TreeHugger Robot
7705d5fd6e Merge "Exclude children from excess space distribution when using largest child" into nyc-dev 2016-06-30 17:07:07 +00:00
Alan Viverette
070b22bdee Exclude children from excess space distribution when using largest child
Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
2016-06-30 11:15:36 -04: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
Jeff Sharkey
ce3c8ac0f4 Move getRecentTasks() to ParceledListSlice.
am: 479212cf50

Change-Id: Ifb3a5deacda0ff8b73469234d36f9cf711e616c2
2016-06-29 23:53:57 +00: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
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
Dianne Hackborn
1150b735c8 Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29 11:49:01 -07: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