OSDN Git Service
Adam Lesinski [Mon, 13 Mar 2017 19:25:13 +0000 (12:25 -0700)]
BatteryStats: Prevent double-detaching Counter
Detaching a Counter from a TimeBase means you can't use it anymore.
Only newly constructed Counters are automatically attached to a TimeBase.
Bug:
34200689
Test: make FrameworkCoreTests && adb install ... && adb shell am instrument -w -e class com.android.internal.os.BatteryStatsSensorTest com.android.frameworks.coretests
Change-Id: I9309000d5625aa6fe61a3c05f135e5828137d8ce
TreeHugger Robot [Fri, 10 Mar 2017 23:26:23 +0000 (23:26 +0000)]
Merge "Updated alert window notification to new UX spec."
Badhri Jagan Sridharan [Fri, 10 Mar 2017 23:23:45 +0000 (23:23 +0000)]
Merge "Introduce debounce to filter rapidly toggling type-c ports"
TreeHugger Robot [Fri, 10 Mar 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Fix handling usb dialog for wall chargers."
Randy Pan [Fri, 10 Mar 2017 23:15:46 +0000 (23:15 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval" am:
c25e2b79b1 am:
aa72261023
am:
bb76af7c44
Change-Id: Ie442c9e26e4b936d62f86205847b10b4c23875fa
Randy Pan [Fri, 10 Mar 2017 23:11:43 +0000 (23:11 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval" am:
c25e2b79b1
am:
aa72261023
Change-Id: Idf0d156db9cbadd72ca32a23f3791d29df3fabe3
Randy Pan [Fri, 10 Mar 2017 23:08:15 +0000 (23:08 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"
am:
c25e2b79b1
Change-Id: Ic924e478f1278ab0873f33984d3026a5ec63c91c
Treehugger Robot [Fri, 10 Mar 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"
TreeHugger Robot [Fri, 10 Mar 2017 22:43:06 +0000 (22:43 +0000)]
Merge "Always use calling uid for package lookup."
Jean-Michel Trivi [Fri, 10 Mar 2017 22:34:00 +0000 (22:34 +0000)]
Merge "AudioFocusRequest.Builder build exception and focus request deprecation"
Mady Mellor [Fri, 10 Mar 2017 22:11:52 +0000 (22:11 +0000)]
Merge "Add drag down to dismiss pip as a dismiss option"
Marie Janssen [Fri, 10 Mar 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast"
Wale Ogunwale [Fri, 10 Mar 2017 21:17:56 +0000 (13:17 -0800)]
Updated alert window notification to new UX spec.
- Updated strings
- Removed action button
- Clicking on notification takes user to alert window permissions
activity
Bug:
36069437
Test: Manual
Change-Id: I32e59ed3faa7fba1641660095d59f5ebf9acec43
Maurice Lam [Fri, 10 Mar 2017 21:14:53 +0000 (21:14 +0000)]
Merge "Add permission to show notification during setup"
Amith Yamasani [Fri, 10 Mar 2017 21:05:47 +0000 (21:05 +0000)]
Merge "Clean spec to deal with rename of auto_fill to autofill"
Amith Yamasani [Fri, 10 Mar 2017 21:02:43 +0000 (13:02 -0800)]
Clean spec to deal with rename of auto_fill to autofill
Fixes a local build failure I was having.
Test: N/A
Change-Id: I0ad770e96e0a4d72a7d538ebc1ba0b19de5996c7
Paul Duffin [Fri, 10 Mar 2017 20:54:08 +0000 (20:54 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13" am:
2a3a4f81f9 am:
17e5a2d851
am:
ac4eac8970 -s ours
Change-Id: Ied26216ac08a0b6a422edaba485b74d3975a36cf
Paul Duffin [Fri, 10 Mar 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13" am:
2a3a4f81f9
am:
17e5a2d851
Change-Id: I91f5108861ed4eb47d9fae13860e79babf0f4bf9
Badhri Jagan Sridharan [Fri, 10 Mar 2017 20:46:24 +0000 (20:46 +0000)]
Merge "Reformat code"
Paul Duffin [Fri, 10 Mar 2017 20:43:07 +0000 (20:43 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
am:
2a3a4f81f9
Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8
Paul Duffin [Fri, 10 Mar 2017 20:33:20 +0000 (20:33 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
TreeHugger Robot [Fri, 10 Mar 2017 20:09:55 +0000 (20:09 +0000)]
Merge "JNI ImageReader: propagate exceptions when creating surface planes"
Jean-Michel Trivi [Thu, 9 Mar 2017 19:56:51 +0000 (11:56 -0800)]
AudioFocusRequest.Builder build exception and focus request deprecation
AudioFocusRequest.Builder.build() throws IllegalStateException
when invalid parameters were set.
Deprecate legacy focus request methods that used stream types.
Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioFocusTest
Bug:
30258418
Change-Id: Ie8960e686bc495fd06ac1b6f9eec3613ea19aaaa
TreeHugger Robot [Fri, 10 Mar 2017 19:39:02 +0000 (19:39 +0000)]
Merge "Enabling storage notifications on TV"
Amith Yamasani [Fri, 10 Mar 2017 19:34:30 +0000 (19:34 +0000)]
Merge "AssistStructure improvements"
Badhri Jagan Sridharan [Thu, 9 Mar 2017 19:39:41 +0000 (11:39 -0800)]
Reformat code
Moving to Intellij coding format
Change-Id: I412232183f50dcb7f66bce2f07a07e242114eaa8
TreeHugger Robot [Fri, 10 Mar 2017 18:39:55 +0000 (18:39 +0000)]
Merge "Update VVM API"
Paul Duffin [Fri, 10 Mar 2017 18:31:29 +0000 (18:31 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
Robert Shih [Thu, 9 Mar 2017 20:40:09 +0000 (12:40 -0800)]
JNI ImageReader: propagate exceptions when creating surface planes
Bug:
36082388
Test: Manual
Change-Id: I4a0ad08c9b3c53aa7ca702e1c6e2d486b788f3ff
Dmitri Plotnikov [Fri, 10 Mar 2017 18:14:34 +0000 (18:14 +0000)]
Merge "Support for a remote key chord to trigger a bugreport on TV"
TreeHugger Robot [Fri, 10 Mar 2017 18:10:38 +0000 (18:10 +0000)]
Merge "Allow Font providers to return status codes"
Mady Mellor [Thu, 9 Mar 2017 23:37:13 +0000 (15:37 -0800)]
Add drag down to dismiss pip as a dismiss option
If enabled via flag, when the user drags the PIP past
a threshold at the bottom of the screen, the PIP will
be dismissed. If the PIP is sitting near the bottom
edge and the user flings downwards the PIP will be
dismissed.
Unifies logic to identify for “fling towards edge” for
minimize and dismiss gesture — adds additional logic
to check that the start of the fling gesture was near
that edge. This stops you from accidentally minimizing
or dismissing on a “long fling”.
Test: manual - enable flag, and drag pip to bottom of
screen to dismiss
Bug:
35358628
Change-Id: Iddd66ed2720964d431cddea6173767eb5565b991
TreeHugger Robot [Fri, 10 Mar 2017 17:55:28 +0000 (17:55 +0000)]
Merge "TextClassifier: Multiple entities & confidence scores."
Bryce Lee [Fri, 10 Mar 2017 17:48:25 +0000 (17:48 +0000)]
Merge "Persist TaskRecord before calling performClearTaskLocked."
Randy Pan [Fri, 10 Mar 2017 17:40:39 +0000 (09:40 -0800)]
Add a config for WiFi exponential backoff scan base interval
Bug:
36026947
Test: bulid and boot up the phone
Change-Id: I4971c1c7d0fc162ac5934becbdf28fba50d65c11
TreeHugger Robot [Fri, 10 Mar 2017 17:46:26 +0000 (17:46 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership"
Amith Yamasani [Wed, 22 Feb 2017 20:59:53 +0000 (12:59 -0800)]
AssistStructure improvements
Added isOpaque() for Views
Added getAcquisitionStartTime(), ...EndTime()
Added isHomeActivity()
Bug:
30895450
Test: cts-tradefed run cts-dev -m CtsAssistTestCases -t
android.assist.cts.AssistStructureTest#testAssistStructure
Change-Id: I294a089aa3454ebfebf0442036d98ccb86cb2827
Etan Cohen [Fri, 10 Mar 2017 17:28:49 +0000 (17:28 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit" am:
3dee29581e am:
652aa82d7e
am:
dff2c71b86
Change-Id: I0069a17cd38d628a53de46c42b3a0adb82b577b5
Etan Cohen [Fri, 10 Mar 2017 17:22:01 +0000 (17:22 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit" am:
3dee29581e
am:
652aa82d7e
Change-Id: Id74e92bd7fea99e94536f4d3e992828aa84aa671
Winson Chung [Fri, 10 Mar 2017 17:18:41 +0000 (17:18 +0000)]
Merge "Adding check to ensure device exists before setting pointer type."
Etan Cohen [Fri, 10 Mar 2017 17:13:42 +0000 (17:13 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"
am:
3dee29581e
Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690
Etan Cohen [Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"
Daniel Nishi [Fri, 10 Mar 2017 16:46:20 +0000 (16:46 +0000)]
Merge "Don't look up storage for uninstalled apps."
Clara Bayarri [Fri, 10 Feb 2017 15:44:35 +0000 (15:44 +0000)]
Allow Font providers to return status codes
This was requested by the current users, need to state
that a font is unavailable (needs downloading) or that
the query is unsupported.
Also add tests :)
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/FontsContractTest.java
Also CTS attached to topic
Bug:
35097775
Change-Id: Ib15bf4c70185d81a4c20426722eb44c4210771c2
Bryce Lee [Thu, 9 Mar 2017 19:54:08 +0000 (11:54 -0800)]
Persist TaskRecord before calling performClearTaskLocked.
A recent change persisted this record with a member variable that
could be cleared as a result of performClearTasklocked. This
changelist resolves this by using a local variable to store the
reference until after the method call.
Change-Id: I6d5d42e06afdbf6e8ff960fcfae71c80abd891f4
Fixes:
36001400
Test: adb shell am instrument -w -e class com.google.android.setupwizard.tests.activity.SetupWizardExitActivityTest com.google.android.setupwizard.tests.activity com.google.android.setupwizard.tests.activity/.SetupWizardTestRunner
Leon Scroggins III [Fri, 10 Mar 2017 15:50:33 +0000 (10:50 -0500)]
Stop explicitly using kCallerPasses_Ownership
Test: No change in behavior, no new tests.
This enum is going away in https://skia-review.googlesource.com/c/9498,
and this method is using the default anyway.
Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058
Jerome Gaillard [Fri, 10 Mar 2017 15:42:55 +0000 (15:42 +0000)]
Merge "Update Shader delegates following Change Ib5d33a80"
Abodunrinwa Toki [Wed, 8 Mar 2017 17:21:40 +0000 (17:21 +0000)]
TextClassifier: Multiple entities & confidence scores.
- Updates JNI layer to support multiple entities & confidence scores
- Updates code to include multiple entities & confidence scores
- Fixes EntityConfidence sorting to be descending order
Test: cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.textclassifier.cts.TextClassificationManagerTest
Bug:
35153211
Change-Id: I4878fe7573f5cb7f3eafb1b50c7baf331a336cb1
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000 (18:49 +0000)]
Refactor code incompatible with Mockito 2.7.13
Bug:
32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000 (18:49 +0000)]
Refactor code incompatible with Mockito 2.7.13
(cherry picked from
76e319f015c2b43498ce3ce610a253d63e76cbf3)
Some additional internal only refactorings were done as well.
Bug:
32912773
Test: make checkbuild
Change-Id: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Jerome Gaillard [Fri, 10 Mar 2017 14:03:05 +0000 (14:03 +0000)]
Update Shader delegates following Change Ib5d33a80
Test: layoutlib tests
Change-Id: If0db59dd2400ced9019bb999c014d7d655021fd3
TreeHugger Robot [Fri, 10 Mar 2017 13:02:56 +0000 (13:02 +0000)]
Merge "Add info on each WebView package in webviewupdate-dumpsys."
fionaxu [Fri, 10 Mar 2017 10:04:00 +0000 (10:04 +0000)]
Merge "polish the notification of the default carrier app" am:
b224b318a0 am:
64e0d4553b
am:
b920519c91
Change-Id: Idb6513f6706bed29caa616aa08e3bd16778930ae
fionaxu [Fri, 10 Mar 2017 09:57:33 +0000 (09:57 +0000)]
Merge "polish the notification of the default carrier app" am:
b224b318a0
am:
64e0d4553b
Change-Id: I12f02f834aef5928354e6afed560db60ddf2a284
fionaxu [Fri, 10 Mar 2017 09:54:53 +0000 (09:54 +0000)]
Merge "decouple carrierdefaultapp from phone process" am:
e32fc81c5d am:
1fdd29d799
am:
780c1cc26d
Change-Id: Ib46becf994bba0c18b4a58af494331baa0c78959
fionaxu [Fri, 10 Mar 2017 09:52:22 +0000 (09:52 +0000)]
Merge "polish the notification of the default carrier app"
am:
b224b318a0
Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd
fionaxu [Fri, 10 Mar 2017 09:48:21 +0000 (09:48 +0000)]
Merge "decouple carrierdefaultapp from phone process" am:
e32fc81c5d
am:
1fdd29d799
Change-Id: If09f032ad197665d1829f49ef10c0819ccb2e373
Treehugger Robot [Fri, 10 Mar 2017 09:44:02 +0000 (09:44 +0000)]
Merge "polish the notification of the default carrier app"
fionaxu [Fri, 10 Mar 2017 09:40:59 +0000 (09:40 +0000)]
Merge "decouple carrierdefaultapp from phone process"
am:
e32fc81c5d
Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e
Treehugger Robot [Fri, 10 Mar 2017 09:33:08 +0000 (09:33 +0000)]
Merge "decouple carrierdefaultapp from phone process"
fionaxu [Fri, 10 Mar 2017 06:25:29 +0000 (22:25 -0800)]
decouple carrierdefaultapp from phone process
Bug:
36114351
Test: Manual
Change-Id: I679d97bd9854fe478499d1fac6225c3f954ecdbc
TreeHugger Robot [Fri, 10 Mar 2017 07:05:35 +0000 (07:05 +0000)]
Merge "Replaced auto-fill by autofill to keep it consistent with API style."
Ashutosh Joshi [Fri, 10 Mar 2017 07:01:59 +0000 (07:01 +0000)]
Merge "Add logging to ContextHubService."
TreeHugger Robot [Fri, 10 Mar 2017 05:15:18 +0000 (05:15 +0000)]
Merge "Modify SurfaceView to use SurfaceFlinger child surfaces."
Fyodor Kupolov [Fri, 10 Mar 2017 04:25:06 +0000 (04:25 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a am:
ff5be765b1 am:
6ca67f067a am:
e385c8a0b9 am:
aeb33eb0a8
am:
ff22f82008 -s ours
Change-Id: Ib425635a0e9d254b881a8a64f8d18d426350b6dd
Fyodor Kupolov [Fri, 10 Mar 2017 04:18:53 +0000 (04:18 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a am:
ff5be765b1 am:
6ca67f067a am:
e385c8a0b9
am:
aeb33eb0a8
Change-Id: Ic40ee441c6ba8ed2289cc6b1a8ac2414e2f5d928
Fyodor Kupolov [Fri, 10 Mar 2017 04:12:42 +0000 (04:12 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a am:
ff5be765b1 am:
6ca67f067a
am:
e385c8a0b9
Change-Id: I013ae3547aa049a19aae6840e9e80a4a361527e3
Fyodor Kupolov [Fri, 10 Mar 2017 04:04:01 +0000 (04:04 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a am:
ff5be765b1
am:
6ca67f067a
Change-Id: Ibd38a2b0bd180180bb3812dedaf22ab07000aee9
Fyodor Kupolov [Fri, 10 Mar 2017 03:58:02 +0000 (03:58 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a
am:
ff5be765b1
Change-Id: I4fb68c79924a046a065f893b14877fb6d6e21632
Andy Hung [Fri, 10 Mar 2017 03:54:02 +0000 (03:54 +0000)]
Merge "VolumeShaper: Use ISE for Builder methods with no arguments"
Fyodor Kupolov [Fri, 10 Mar 2017 03:48:47 +0000 (03:48 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours
am:
1fd70c201a
Change-Id: Ia89d648b7b9042781c41a8bb0ffa7a125b3f36d1
Fyodor Kupolov [Fri, 10 Mar 2017 03:40:12 +0000 (03:40 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f
am:
f7cde31747 -s ours
Change-Id: I801cd8c8e607f2c88edb26ea1947e650f128df4d
Fyodor Kupolov [Fri, 10 Mar 2017 03:36:11 +0000 (03:36 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f am:
a1aa5cb34a am:
e3e01cc375 am:
6ce5879e11 am:
68b9522d45
am:
1bba0ba7f5 -s ours
Change-Id: I5d81755dc6c429d0b13a0c9bd434ed21eca0eac6
Fyodor Kupolov [Fri, 10 Mar 2017 03:34:38 +0000 (03:34 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4
am:
f937aabb0f
Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168
Fyodor Kupolov [Fri, 10 Mar 2017 03:32:19 +0000 (03:32 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf am:
5a16e06272 am:
73ceabb948 am:
e2aeaa9998 am:
52a0172003
am:
15cf9d572e -s ours
Change-Id: I383d0e7c4e0d96fc6d316a2e031283b180ce16b9
Fyodor Kupolov [Fri, 10 Mar 2017 03:28:56 +0000 (03:28 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886
am:
9e2cf8e5c4
Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad
Fyodor Kupolov [Fri, 10 Mar 2017 03:28:51 +0000 (03:28 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f am:
a1aa5cb34a am:
e3e01cc375 am:
6ce5879e11
am:
68b9522d45
Change-Id: I0c47434e3e5297dc392a1b58a84f0f51ca89d1c7
Fyodor Kupolov [Fri, 10 Mar 2017 03:24:44 +0000 (03:24 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf am:
5a16e06272 am:
73ceabb948 am:
e2aeaa9998
am:
52a0172003
Change-Id: I4d80106165ea38fd44ef3a73aeeaac02077219be
Fyodor Kupolov [Fri, 10 Mar 2017 03:23:34 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours
am:
aa0b718886
Change-Id: Ife44fe3b8b295901699de0043dba5bcdc06f32f3
TreeHugger Robot [Fri, 10 Mar 2017 03:22:13 +0000 (03:22 +0000)]
Merge "Fixed a bug where the increased height wasn't applied correctly"
Fyodor Kupolov [Fri, 10 Mar 2017 03:20:10 +0000 (03:20 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f am:
a1aa5cb34a am:
e3e01cc375
am:
6ce5879e11
Change-Id: Id25ccb2ef13e266090c5759e34dee8b93175402d
Fyodor Kupolov [Fri, 10 Mar 2017 03:17:46 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2
am:
2411b4f774 -s ours
Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7
Fyodor Kupolov [Fri, 10 Mar 2017 03:15:52 +0000 (03:15 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf am:
5a16e06272 am:
73ceabb948
am:
e2aeaa9998
Change-Id: I4b07cb2d90fc1af523a3b91817f18ec1e99100fc
Fyodor Kupolov [Fri, 10 Mar 2017 03:12:06 +0000 (03:12 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours
am:
2c112c4ad2
Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a
Fyodor Kupolov [Fri, 10 Mar 2017 03:11:33 +0000 (03:11 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f am:
a1aa5cb34a
am:
e3e01cc375
Change-Id: Ied0957306478565b83e6717659753ed53042248b
Fyodor Kupolov [Fri, 10 Mar 2017 03:09:52 +0000 (03:09 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6 am:
48a36cdade -s ours am:
e8fb34b44c am:
c4054a8b7f am:
885acaff75 am:
4d1253afcc am:
c50e273b0a
am:
59ac10e200 -s ours
Change-Id: Id0905c790bc866419e9350c63b32c4fa98cfe8bb
Fyodor Kupolov [Fri, 10 Mar 2017 03:07:21 +0000 (03:07 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf am:
5a16e06272
am:
73ceabb948
Change-Id: I3b68d137a93d8d35c08878b486924c6c0e824327
Fyodor Kupolov [Fri, 10 Mar 2017 03:06:31 +0000 (03:06 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours
am:
de9cb7ed68 -s ours
Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab
Fyodor Kupolov [Fri, 10 Mar 2017 03:03:03 +0000 (03:03 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f
am:
a1aa5cb34a
Change-Id: Idb8e058c25dc0f9fe9a1de880a6cb4f052a8729d
Fyodor Kupolov [Fri, 10 Mar 2017 03:01:49 +0000 (03:01 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6 am:
48a36cdade -s ours am:
e8fb34b44c am:
c4054a8b7f am:
885acaff75 am:
4d1253afcc
am:
c50e273b0a
Change-Id: I359f0dc5c2e90bc9bb8f54b0a5bbab835acaa1e0
Fyodor Kupolov [Fri, 10 Mar 2017 03:00:46 +0000 (03:00 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70
am:
156fa32e2a -s ours
Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c
Fyodor Kupolov [Fri, 10 Mar 2017 02:59:41 +0000 (02:59 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf
am:
5a16e06272
Change-Id: I314400073f43d720f74eac2e8f744b3768537f49
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:29 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours
am:
9c4d89c55f
Change-Id: Ief6c78fd5c3d281eae14928bd5572e0042cbc684
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:07 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354
am:
a821245d70
Change-Id: I1e47c963728906cb2283a353c882017368d07747
Fyodor Kupolov [Fri, 10 Mar 2017 02:54:07 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b am:
4130501c19 am:
3a8534f18e am:
a74748d05e -s ours am:
dd472080f0 am:
221088d6df am:
cc484a5cdf am:
b091206f92 am:
9ef5a41923
am:
4e7673e552 -s ours
Change-Id: Icf417c4105143f0bcf1d8ede2e2bce2ac48213f9
Fyodor Kupolov [Fri, 10 Mar 2017 02:54:01 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6 am:
48a36cdade -s ours am:
e8fb34b44c am:
c4054a8b7f am:
885acaff75
am:
4d1253afcc
Change-Id: I3e6bbbe56d17b61e31cfb673ac198ba5b4825992
Fyodor Kupolov [Fri, 10 Mar 2017 02:50:38 +0000 (02:50 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours
am:
567e742daf
Change-Id: Iad3060ad58e0276c5125a54915f35e01eaa5babe
Fyodor Kupolov [Fri, 10 Mar 2017 02:49:34 +0000 (02:49 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am:
ac87aee354
Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:57 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4
am:
1aaef53444 -s ours
Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:17 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b am:
4130501c19 am:
3a8534f18e am:
a74748d05e -s ours am:
dd472080f0 am:
221088d6df am:
cc484a5cdf am:
b091206f92
am:
9ef5a41923
Change-Id: I8f14bb9bb61d907614039acb773f2a177b6c8a9f
OSDN Git Service
