Vladislav Kaznacheev
e789a314d1
am e07e684f: am 469840aa: am c3213285: am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
...
* commit 'e07e684f43665a19d0494d10dbc1e25129ca242b':
Keep OverScroller.SplineOverScroller state consistent.
2015-08-05 20:36:58 +00:00
Ajay Panicker
d29d8e3ea1
am b3b98185: am c89da1c7: am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)
...
* commit 'b3b98185370f922758dee81507d750f1f4f9e262':
Implement Bluetooth settings factory reset (2/5)
2015-08-05 20:35:42 +00:00
Vladislav Kaznacheev
e07e684f43
am 469840aa: am c3213285: am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
...
* commit '469840aa48e30d96a1f5329d38e177ab18b924d9':
Keep OverScroller.SplineOverScroller state consistent.
2015-08-05 20:07:54 +00:00
Vladislav Kaznacheev
c32132853f
am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
...
* commit '072097bd3f2b685b4b21d415c2b70cbca9eb76fd':
Keep OverScroller.SplineOverScroller state consistent.
2015-08-05 19:48:39 +00:00
Vladislav Kaznacheev
072097bd3f
am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
...
* commit '8cc00243423e22a36c518cd5ece97b45271ae5e8':
Keep OverScroller.SplineOverScroller state consistent.
2015-08-05 19:40:37 +00:00
Vladislav Kaznacheev
8cc0024342
Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
2015-08-05 19:34:38 +00:00
Ajay Panicker
b3b9818537
am c89da1c7: am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)
...
* commit 'c89da1c70c3f202052f85ccca9145eda04817deb':
Implement Bluetooth settings factory reset (2/5)
2015-08-05 18:29:04 +00:00
Ajay Panicker
1820dc06a3
am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)
...
* commit '106e4f4ca06003ed2cf57bddb24f46a1142cdc49':
Implement Bluetooth settings factory reset (2/5)
2015-08-05 18:10:35 +00:00
Ajay Panicker
106e4f4ca0
am cda6e878: Implement Bluetooth settings factory reset (2/5)
...
* commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963':
Implement Bluetooth settings factory reset (2/5)
2015-08-05 18:01:10 +00:00
Rubin Xu
82543934db
am 9b5bd26e: am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
...
* commit '9b5bd26ee1855e5527f448e5e26181e12320b956':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:49:31 +00:00
Rubin Xu
9b5bd26ee1
am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
...
* commit 'c0ad5751f895a1f76b8302b7fd068bd62a6058f3':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:44:22 +00:00
Ajay Panicker
cda6e878cd
Implement Bluetooth settings factory reset (2/5)
...
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug: 16161518
2015-08-05 10:35:15 -07:00
Niels Egberts
ac3828db35
am d609d22e: am 3c204b61: am 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
...
* commit 'd609d22eb5712b7121ea5ec3ed489bfab56c354a':
NPE occured when trying to parcel voice features.
2015-08-05 17:18:17 +00:00
Ian Pedowitz
689fb3ac3f
am 2d7a9d37: am c3e4f31e: am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
...
* commit '2d7a9d373fffa3cdd8ddaa43da3d00c866daead1':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 17:18:10 +00:00
Niels Egberts
d609d22eb5
am 3c204b61: am 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
...
* commit '3c204b61759099cd51e08a5fbc460d03d383a1b1':
NPE occured when trying to parcel voice features.
2015-08-05 17:11:24 +00:00
Ian Pedowitz
2d7a9d373f
am c3e4f31e: am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
...
* commit 'c3e4f31e9ba64f92e3f06a9ce401211c1c058859':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 17:11:18 +00:00
Rubin Xu
6b6b9cd911
am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
...
* commit '0149636785a00eced7aeb97a6b5606c46582d05c':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:09:00 +00:00
Rubin Xu
0149636785
am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
...
* commit 'ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:00:58 +00:00
Rubin Xu
ab868effb7
Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
2015-08-05 16:55:50 +00:00
Niels Egberts
8e4a16b816
am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
...
* commit 'a02bd53edefa6868829602675c068926ef270c63':
NPE occured when trying to parcel voice features.
2015-08-05 16:55:26 +00:00
Ian Pedowitz
76b0770558
am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
...
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 16:55:22 +00:00
Niels Egberts
a02bd53ede
am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
...
* commit '6bdc4637d7ac1df86e9d745ac483987107a71282':
NPE occured when trying to parcel voice features.
2015-08-05 16:48:24 +00:00
Ian Pedowitz
4d2eec1434
am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
...
* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 16:48:18 +00:00
Xiaohui Chen
2b45f8a6ce
Clean up USER_OWNER references in settingslib.
...
Bug: 19913735
Change-Id: I0ccaed63c8fbc3bcbbd8d5cf8047e33c6e2edb5c
2015-08-05 16:31:19 +00:00
Rubin Xu
41f2ccb9e4
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
...
Starting from M, this extra is also supported in NFC bump provisioning.
Bug: 22914251
Change-Id: I835d12918c5de4ff782245def6565eeb0f052934
2015-08-05 17:21:25 +01:00
Niels Egberts
6bdc4637d7
Merge "NPE occured when trying to parcel voice features." into mnc-dev
2015-08-05 15:57:55 +00:00
Niels Egberts
54545f7e65
NPE occured when trying to parcel voice features.
...
The default features member should be an empty list instead of null.
Bug: 22404239
Change-Id: Ia39982f17fd3b3cd0f3556435170aed2fac14fb8
2015-08-05 15:48:26 +01:00
Ian Pedowitz
df5a661107
Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
2015-08-05 14:34:13 +00:00
Ian Pedowitz
6cc066df7a
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
...
This reverts commit 845d14db90
2015-08-05 14:25:15 +00:00
Paul Jensen
9180e2ea59
am abd27102: am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
...
* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 11:44:46 +00:00
Paul Jensen
abd27102f4
am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
...
* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 11:38:26 +00:00
Paul Jensen
9529773222
am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
...
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 11:24:18 +00:00
Paul Jensen
86e7d135ac
resolved conflicts for merge of dbc4edcc to mnc-dr-dev
...
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
2015-08-05 10:03:47 +00:00
Filip Gruszczynski
101d93bfb8
am 42969008: am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
...
* commit '42969008ef898f204fc9f3504f85bb82ffc810c3':
Make ResourceKey always use non-null configuration override.
2015-08-04 23:47:21 +00:00
Filip Gruszczynski
42969008ef
am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
...
* commit '94858568a1ee6af7b40ae0fcc5c4453dffca1cb8':
Make ResourceKey always use non-null configuration override.
2015-08-04 23:39:08 +00:00
Filip Gruszczynski
c3080d7855
am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
...
* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
Make ResourceKey always use non-null configuration override.
2015-08-04 23:18:47 +00:00
Filip Gruszczynski
841d7b7517
am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
...
* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
Make ResourceKey always use non-null configuration override.
2015-08-04 23:11:24 +00:00
Filip Gruszczynski
52d3312abe
Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
2015-08-04 23:02:19 +00:00
Filip Gruszczynski
a01f48681c
Make ResourceKey always use non-null configuration override.
...
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.
We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.
Bug: 22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
2015-08-04 15:26:14 -07:00
Roshan Pius
38b4520735
am ea7632ac: am 9d15a496: am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
...
* commit 'ea7632ac0694a5ba04ef0d597300f92e5fc22962':
Mark missed calls as read in calllog restore(2/2)
2015-08-04 22:17:32 +00:00
Roshan Pius
ea7632ac06
am 9d15a496: am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
...
* commit '9d15a496d1354210da4ad83ee018b6dacf14b478':
Mark missed calls as read in calllog restore(2/2)
2015-08-04 22:10:31 +00:00
Steve McKay
371d458838
Merge "Populate quick view intent w/ file uris."
2015-08-04 22:07:18 +00:00
Steve McKay
6eaf3863c8
Populate quick view intent w/ file uris.
...
Change-Id: Ie4f15b11be1939f8b71752505caa9d74ab9f9680
2015-08-04 15:06:40 -07:00
Roshan Pius
1c53d91e81
am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
...
* commit '65b84a165239ea8e50b8a7129da7eb1ad4536308':
Mark missed calls as read in calllog restore(2/2)
2015-08-04 21:56:58 +00:00
Roshan Pius
65b84a1652
am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
...
* commit '78b8d4aa99ce866caacf291a446837416fa07bd7':
Mark missed calls as read in calllog restore(2/2)
2015-08-04 21:48:38 +00:00
Yohei Yukawa
932cc25416
am 94381db0: am f4b8c343: am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
...
* commit '94381db0dd29bcb7d6bf1f266644c7032b2bffcb':
Revert "Do not forceLayout when window is resized"
2015-08-04 21:29:28 +00:00
Nick Kralevich
1913ae958c
am 8ad7c8f9: am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2 )" into mnc-dev
...
* commit '8ad7c8f9553611798fa39ff20cea3313c5b64922':
UsbDeviceManager: fix b/21429947 regression (try #2 )
2015-08-04 21:29:21 +00:00
Vladislav Kaznacheev
84ad7e9ee2
Keep OverScroller.SplineOverScroller state consistent.
...
Currently update() bails out early if it is called
too soon after mStartTime has been set. In this case
mCurrentPosition remains holding an obsolete value
from a previous animation. This causes some strange
behavior (see the referenced bug).
This patch makes sure that mCurrentPosition is
updated every time that mStart is updated.
Bug: 22950559
Change-Id: I07b92f30ebe29856f4e04dc19a4820123713fd7e
2015-08-04 21:24:59 +00:00
Yohei Yukawa
94381db0dd
am f4b8c343: am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
...
* commit 'f4b8c343219f14f56c2c1b86ee9e84e0b7487ece':
Revert "Do not forceLayout when window is resized"
2015-08-04 21:18:50 +00:00
