Commit Graph

80237 Commits

Author SHA1 Message Date
Adam Lesinski
204f662f31 Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681

Change-Id: Ic4b22dab0f73fb91b23946946b6e2d30727606df
2017-07-07 02:50:55 +00:00
Lucas Dupin
1446809f30 Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30
2017-07-07 02:42:35 +00:00
TreeHugger Robot
da075a9681 Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev 2017-07-07 01:38:01 +00:00
TreeHugger Robot
b1ab0ff21e Merge "Hide all color hints references" into oc-dr1-dev 2017-07-07 00:12:08 +00:00
Ruchi Kandoi
a404bfb348 Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52
am: 67d3257519

Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc
2017-07-06 23:04:53 +00:00
Love Khanna
308f484f7c NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
am: a161427214

Change-Id: If545ea98d8c8d6a97006bcc455b55e7c665e5a66
2017-07-06 23:03:36 +00:00
Ruchi Kandoi
67d3257519 Merge changes from topic 'NCI-2.0' am: 430dded515
am: 4d08be4a52

Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4
2017-07-06 22:56:19 +00:00
Love Khanna
a161427214 NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
am: 93d313b0a0

Change-Id: If6952f71012f48a789c31775161720dd409bf40b
2017-07-06 22:55:33 +00:00
Ruchi Kandoi
4d08be4a52 Merge changes from topic 'NCI-2.0'
am: 430dded515

Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f
2017-07-06 22:48:20 +00:00
Love Khanna
93d313b0a0 NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am: e7ecebae11

Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6
2017-07-06 22:47:08 +00:00
Ruchi Kandoi
430dded515 Merge changes from topic 'NCI-2.0'
* changes:
  AID suffix registration.
  NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
2017-07-06 22:41:29 +00:00
TreeHugger Robot
5cb8f220a8 Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
* changes:
  NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
  AID suffix registration.
2017-07-06 22:39:48 +00:00
Daniel Nishi
932f36050c Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am: a48cf1e619

Change-Id: I4a1531a293f5c3493db22f73bc5511a97e756f52
2017-07-06 22:03:36 +00:00
Daniel Nishi
a48cf1e619 Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev 2017-07-06 21:58:41 +00:00
Adam Lesinski
4eb4129c29 Fix Configuration#updateFrom() when assetsSeq doesn't change
Compare the value of assetsSeq when updating Configuration from
a delta.

Bug: 63352177
Test: manual
Change-Id: I9e1205cd64c4a1e0192b7049c82d36d53fb4af36
(cherry picked from commit 2123c415bf)
2017-07-06 21:56:46 +00:00
Anthony Chen
032df0d2f4 Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
am: 25c84b3321

Change-Id: Ie222fff825cb06fd50b1fff8c1e9dd545da0ef41
2017-07-06 21:28:45 +00:00
Anthony Chen
25c84b3321 Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev 2017-07-06 21:14:47 +00:00
Andrew Solovay
c2c0997b40 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928
am: ee10807328

Change-Id: I6ba7c1255c103075fce541db27226996366968a3
2017-07-06 20:21:44 +00:00
Daniel Nishi
fa1143658b Add a Setting for whether or not we have been disabled by policy.
Bug: 62106274, 35698183
Test: StorageManager robotests
Merged-In: I1788d6143362130df88950c6843fa78b67182d5e
(cherry picked from commit da7332c070)
2017-07-06 20:00:25 +00:00
Andrew Solovay
ee10807328 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: I5fb70c606842dd5af7fdb5506d7a0d14e83aeab9
2017-07-06 18:58:22 +00:00
Andrew Solovay
5f00dfa5b8 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: Ief0f1ce03e137ae4a16067cf7430cf7bc333a96d
2017-07-06 18:58:17 +00:00
Love Khanna
ca26b128ea NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
As per NCI2.0 LF_T3T_PMM is a part of LF_T3T_IDENTIFIER.
Since it is required for each LF_T3T_IDENTIFIER entry,
It can be taken from application.

Test: Compiles.

Change-Id: Icc168592c292d869a4c331dd28fe43b4d75c9a41
(cherry picked from commit e7ecebae11)
2017-07-06 11:57:42 -07:00
Love Khanna
68f719e196 AID suffix registration.
Test: compiles.

Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
(cherry picked from commit e910e8bf86)
2017-07-06 11:57:20 -07:00
Andrew Solovay
040b774928 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev 2017-07-06 18:42:13 +00:00
Fyodor Kupolov
16ff7bc82a Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517
am: aee5787b48

Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f
2017-07-06 18:37:34 +00:00
Fyodor Kupolov
aee5787b48 Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31
2017-07-06 18:30:44 +00:00
Fyodor Kupolov
481d92c517 Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
2017-07-06 18:21:54 +00:00
Fyodor Kupolov
09b6988e27 Merge "Fix ContentObserver unregister issue" 2017-07-06 18:07:04 +00:00
Adrian Roos
fd9d88beb3 Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am: 92b6b7090c

Change-Id: I834761678ad26b66ac3e3b93a1398d9fce5e0f6c
2017-07-06 18:02:30 +00:00
TreeHugger Robot
92b6b7090c Merge "AOD: Skip window animations while dozing" into oc-dr1-dev 2017-07-06 17:53:24 +00:00
Love Khanna
e910e8bf86 AID suffix registration.
Test: compiles.

Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
2017-07-06 10:31:27 -07:00
Jason Monk
28e83de5ae Merge "Layout updates to share sheet" into oc-dr1-dev
am: 2a050dae1a

Change-Id: I1243c4def83a7b116373af01dda2cb883a036e09
2017-07-06 15:18:25 +00:00
Adrian Roos
e94c15ca96 AOD: Skip window animations while dozing
Fixes: 37245619
Test: go/wm-smoke; Go to home, turn off phone, observe that during the transition to AOD the navigation bar hide animation does not play.
Change-Id: I9a2fce4295900648a680e8e7e8fee0fbb447dd3d
2017-07-06 17:13:07 +02:00
Jason Monk
027dcfa4a5 Layout updates to share sheet
The biggest change is that padding will only appear above/below
service section, and at the start of the non-service section. For
this a bunch of changes to how padding is needed.

Also some other dimen changes for specs.

Test: visual
Change-Id: I39747701597e620425bdcb4113d1a3585f6de137
Fixes: 37913738
2017-07-06 09:09:21 -04:00
Narayan Kamath
ac27936be5 Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I34dc28cd87e5111fccff05893ddf5c1155ad8746
2017-07-06 11:36:41 +00:00
TreeHugger Robot
84e0f453d1 Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev 2017-07-06 11:30:03 +00:00
Mathieu Chartier
b355b7f446 Merge "ProcessStats: fix uss average value offset" 2017-07-06 03:13:52 +00:00
daqi
2df4e144a9 Fix ContentObserver unregister issue
[Cause of Defect]
In the ContentObserver callback procedure, the binder thread
has no sync mechanism with handler thread.
The ContentObserver#onChange method can get called after
ContentResolver#unregisterContentObserver called in the
very low probability.

Bug: https://issuetracker.google.com/issues/63154326
Test: manual - check https://github.com/nanjingdaqi/ContentObserverDemo
Change-Id: I0e3831eba7a9cc1a5bf0d30abe5dd0ec8259b0d4
Signed-off-by: daqi <daqi@xiaomi.com>
2017-07-06 10:09:21 +08:00
jackqdyulei
8f386f6e24 Merge "Update the smearing methods in framework." into oc-dr1-dev
am: 386d8133c4

Change-Id: I383384c1cd30e5ab4f88a5e95a9b0068e573fe2d
2017-07-06 01:00:59 +00:00
TreeHugger Robot
386d8133c4 Merge "Update the smearing methods in framework." into oc-dr1-dev 2017-07-06 00:49:56 +00:00
Garfield Tan
8ea8db199d Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
am: 28042d09d1

Change-Id: I29b452dbb955d65806cd472cf20d4595ac4844dc
2017-07-05 22:46:14 +00:00
Siarhei Vishniakou
c7b722117c Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev
am: 20a240fc5d

Change-Id: Ied28ed4e4ae56aca9ac315f0963a027710960286
2017-07-05 22:44:32 +00:00
TreeHugger Robot
28042d09d1 Merge "Clear calling id before updating MediaStore." into oc-dr1-dev 2017-07-05 22:39:37 +00:00
TreeHugger Robot
20a240fc5d Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev 2017-07-05 22:37:32 +00:00
Anthony Chen
ea202f6646 Fix bug where RemoteViews addView is backwards.
The index on where to add a child view was not being saved when writing
to a Parcel. This causes the index to default to 0 and resulted in views
always being added as the first view.

Now, persist this value to the Parcel and restore it.

Test: booted up on Nexus 6P, created notification with RemoteView, added
two views and verified views added in correct order.
Bug: 63177271

Change-Id: I94384e348b8a5168efe0601f382cdd2db6791fdb
2017-07-05 21:12:41 +00:00
jackqdyulei
ce0fd25e2c Update the smearing methods in framework.
1. Fix the bug about foregroundActivityTime. It should take microseconds
as parameter and return microseconds
2. Use the min time of foregroundActivity time and Top time as "screen
time"
3. Hide bluetooth, wifi, idle but don't smear it

Bug: 63176214
Test: runtest -x BatteryStatsHelperTest
Change-Id: I5798577da17d60fb3e3b18351deb31ae77939154
2017-07-05 13:14:08 -07:00
Narayan Kamath
bae484ad8e Zygote: Fix race condition on package preloads.
Before this change, ZygoteProcess.preloadPackageForAbi returned
as soon as the command was written to the zygote socket and not
after the preload completed. This meant that there was a small
window of time before the server side of the socket polled its FDs
where a second command could be written to the zygote socket. This
would lead to only one of the commands being processed and the
other being dropped. The client side of that socket would then wait
forever for a response and bring down the system once the watchdog
timeout was hit.

Example failure case :
--------------
system_server:send command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(preloadPackage)  // the fork command is dropped.

Example of normal operation :
------------------
system_server:send command(preloadPackage)
zygote:poll & process command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(fork)

This change makes preloadPackageForAbi synchronous, which ensures
that each POLLIN event corresponds to precisely one command.

Bug: 62886909
Bug: 13618569
Test: Manual
Contributed-By: yuqianyu@huawei.com

(cherry-picked from commit 24a3306c32)

Change-Id: I83faf974c9a70a6ab18323f692c1981784e4c56a
2017-07-05 17:53:20 +00:00
Hugo Benichi
f060ecf1e8 Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516
am: 0278aa4b70

Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f
2017-07-05 14:47:56 +00:00
Hugo Benichi
0278aa4b70 Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5
am: 0537f16516

Change-Id: If6430976a3a894b9f883e03692e500eb013a5245
2017-07-05 14:40:34 +00:00
Hugo Benichi
0537f16516 Merge "ConnectivityManager: allow usage of TYPE_NONE"
am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
2017-07-05 14:33:35 +00:00