TreeHugger Robot
bac998a0cb
Merge "Prevent WakeLock count ending up in an incorrect state"
2017-10-03 23:04:57 +00:00
TreeHugger Robot
a4fabd3ef2
Merge "Add more fields in Suggestion model"
2017-10-03 22:20:10 +00:00
Selim Cinek
76ea222105
Merge "Collapse Notification panel after tapping CLEAR ALL button" am: ca8b270063 am: d4b6e59cad am: 3674a64029
...
am: adea17d335
2017-10-03 22:15:27 +00:00
Adam Lesinski
897f6ddd31
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev am: 9b581c7bc1
...
am: 8284349fc9
2017-10-03 22:07:18 +00:00
Selim Cinek
adea17d335
Merge "Collapse Notification panel after tapping CLEAR ALL button" am: ca8b270063 am: d4b6e59cad
...
am: 3674a64029
2017-10-03 21:59:03 +00:00
Wonsik Kim
a9361e9115
Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552 am: b7079d6381
...
am: ce29a4c77a
2017-10-03 21:57:22 +00:00
Adam Lesinski
8284349fc9
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
...
am: 9b581c7bc1
2017-10-03 21:51:09 +00:00
Selim Cinek
3674a64029
Merge "Collapse Notification panel after tapping CLEAR ALL button" am: ca8b270063
...
am: d4b6e59cad
2017-10-03 21:45:55 +00:00
TreeHugger Robot
f725749478
Merge "incidentd: Adding RankingHelper data to NotificationManager proto output."
2017-10-03 21:43:50 +00:00
Wonsik Kim
ce29a4c77a
Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552
...
am: b7079d6381
2017-10-03 21:42:14 +00:00
Brad Ebinger
6b450cdc1b
Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97 am: 6ed82dc67b
...
am: 548a7e607d
2017-10-03 21:35:14 +00:00
Wonsik Kim
b7079d6381
Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b
...
am: 4c2bbbf552
2017-10-03 21:30:17 +00:00
Selim Cinek
d4b6e59cad
Merge "Collapse Notification panel after tapping CLEAR ALL button"
...
am: ca8b270063
2017-10-03 21:30:14 +00:00
TreeHugger Robot
9b581c7bc1
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
2017-10-03 21:24:16 +00:00
Brad Ebinger
548a7e607d
Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97
...
am: 6ed82dc67b
2017-10-03 21:23:01 +00:00
TreeHugger Robot
61ce9fcd16
Merge "Rename mCursorDrawble to mDrawableForCursor"
2017-10-03 21:20:47 +00:00
Wonsik Kim
4c2bbbf552
Merge "fix AmrInputStream.read() hang"
...
am: 5b6a02eb8b
2017-10-03 21:18:10 +00:00
Brad Ebinger
6ed82dc67b
Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211
...
am: 387b90aa97
2017-10-03 21:13:34 +00:00
Selim Cinek
ca8b270063
Merge "Collapse Notification panel after tapping CLEAR ALL button"
2017-10-03 21:07:57 +00:00
Julia Reynolds
592a1e3014
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev am: f2c00946e0
...
am: 570c6a499d
2017-10-03 21:06:20 +00:00
Chris Wren
193a5275da
Merge "measure snooze UI use more precisely" into oc-mr1-dev am: 72826c99fa
...
am: 875ecb48f0
2017-10-03 20:57:08 +00:00
Brad Ebinger
387b90aa97
Merge "Adds a filtering bitmask to DownloadStateCallback"
...
am: 177bd65211
2017-10-03 20:55:50 +00:00
Yi Jin
8cf1ffec89
Merge "Implement procstats dumpsys section"
2017-10-03 20:54:13 +00:00
Julia Reynolds
570c6a499d
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
...
am: f2c00946e0
2017-10-03 20:53:31 +00:00
Henrik Baard
8d475ca058
Prevent WakeLock count ending up in an incorrect state
...
WakeLock can end up in a bad state if the following sequence
is executed:
1. mWakeLock = mPowerManager.newWakeLock(...)
2. mWakeLock.acquire(TIMEOUT_MS);
3. timeout TIMEOUT_MS occurs before release() is called
4. release is called()
[1] mInternalCount = mExternalCount = 0
[2] mInternalCount = 1, mExternalCount = 1
[3] mInternalCount = 0, mExternalCount = 1
[4] mInternalCount = -1, mExternalCount = 0
If acquireLocked is called on the same object after this sequence,
mInternalCount is incremented to 0 which results in no wakelock
being requested from PowerManagerService.
Bug: 64676694
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.PowerManager_WakeLockTest
Change-Id: I133812aefb5d92eec2e2dde1a36f81dc9ffd7625
2017-10-03 14:45:34 -06:00
Daniel Nishi
dbdc059d4d
Merge "Fix a cache calculation regression." into oc-mr1-dev am: fcd9565ec5
...
am: aed0474a6d
2017-10-03 20:41:59 +00:00
Chris Wren
875ecb48f0
Merge "measure snooze UI use more precisely" into oc-mr1-dev
...
am: 72826c99fa
2017-10-03 20:40:55 +00:00
Treehugger Robot
5b6a02eb8b
Merge "fix AmrInputStream.read() hang"
2017-10-03 20:37:36 +00:00
Daniel Nishi
aed0474a6d
Merge "Fix a cache calculation regression." into oc-mr1-dev
...
am: fcd9565ec5
2017-10-03 20:31:09 +00:00
Fan Zhang
6abced38e5
Add more fields in Suggestion model
...
- Icon and suggestionType are needed to customize suggestion UI in
Settings.
Bug: 65065268
Test: instrumentation test
Change-Id: I62ca80128d327a2c2e925ed37529c0255ca37a8a
2017-10-03 13:27:42 -07:00
TreeHugger Robot
0bba4b0625
Merge "Correct character in description of glyph widths"
2017-10-03 20:24:09 +00:00
TreeHugger Robot
f2c00946e0
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
2017-10-03 20:23:32 +00:00
Brad Ebinger
177bd65211
Merge "Adds a filtering bitmask to DownloadStateCallback"
2017-10-03 20:23:00 +00:00
TreeHugger Robot
bed34700b9
Merge "Make WifiTracker lifecycle aware"
2017-10-03 20:21:52 +00:00
Chris Wren
72826c99fa
Merge "measure snooze UI use more precisely" into oc-mr1-dev
2017-10-03 20:16:58 +00:00
Etan Cohen
5b8273e465
Merge "[RTT2] Add API for testing whether feature exists on platform"
2017-10-03 20:14:31 +00:00
Daniel Nishi
fcd9565ec5
Merge "Fix a cache calculation regression." into oc-mr1-dev
2017-10-03 20:11:26 +00:00
TreeHugger Robot
dcc0ee2dd6
Merge "Stop returning run width of StaticLayout.Builder.addStyleRun."
2017-10-03 19:48:17 +00:00
Chris Wren
5e76a0c79c
Merge "renumber master enums to avoid mr1 collision"
2017-10-03 19:36:54 +00:00
Kweku Adams
62b4224757
incidentd: Adding RankingHelper data to NotificationManager proto output.
...
BUG: 65750824
Test: flash on device and look at incident.proto output
Change-Id: I9323cc109d96715b2114aa405eda79ae4c109c14
2017-10-03 12:35:48 -07:00
TreeHugger Robot
dffe6733b2
Merge "Improve handling of devices without a WebView."
2017-10-03 19:35:06 +00:00
Brad Ebinger
62b4cf99a9
Merge "Remove verification for DownloadReceiver when failure" am: f78beae681 am: 354eed7bac am: 91c55f189c
...
am: 743539acfd
2017-10-03 19:27:42 +00:00
Brad Ebinger
146430cce3
Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a am: 4b76f8420f
...
am: 5fc881f7e7
2017-10-03 19:18:12 +00:00
Brad Ebinger
743539acfd
Merge "Remove verification for DownloadReceiver when failure" am: f78beae681 am: 354eed7bac
...
am: 91c55f189c
2017-10-03 19:16:08 +00:00
Roozbeh Pournader
e06eebf480
Rename mCursorDrawble to mDrawableForCursor
...
To go around app bugs caused by assuming that mCursorDrawable is an
array. The apps try to manipulate mCursorDrawable by using
reflection, but crash since they access it incorrectly after it
changed from an array to a single Drawable in
I249befaf70630bef435c8db9039e8aacf233bf7c.
Bug: 66988832
Test: mmm -j frameworks/base
Change-Id: I04fc930d786dd4c74b560d7a25d17353f49ea25b
2017-10-03 12:13:46 -07:00
Brad Ebinger
5fc881f7e7
Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a
...
am: 4b76f8420f
2017-10-03 19:07:46 +00:00
Brad Ebinger
91c55f189c
Merge "Remove verification for DownloadReceiver when failure" am: f78beae681
...
am: 354eed7bac
2017-10-03 19:05:26 +00:00
Brad Ebinger
4b76f8420f
Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028
...
am: 768b6c5e4a
2017-10-03 18:58:11 +00:00
Brad Ebinger
354eed7bac
Merge "Remove verification for DownloadReceiver when failure"
...
am: f78beae681
2017-10-03 18:51:32 +00:00
Brad Ebinger
768b6c5e4a
Merge "Decouple Content Name Locale from Content Language Locale"
...
am: a830e83028
2017-10-03 18:45:43 +00:00
