OSDN Git Service
TreeHugger Robot [Wed, 24 May 2017 11:00:03 +0000 (11:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Andrei Stingaceanu [Wed, 24 May 2017 09:37:18 +0000 (09:37 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev am:
98891dbb70
am:
9d26cc1129
Change-Id: I09779c5ed7a5161a8396f13a6d8a6af16aaf7cfc
Andrei Stingaceanu [Wed, 24 May 2017 09:24:08 +0000 (09:24 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev
am:
98891dbb70
Change-Id: I21ad151333ac9582951cefa822727b53be747eec
Andrei Stingaceanu [Wed, 24 May 2017 09:16:42 +0000 (09:16 +0000)]
Merge "AutoSize TextView - correct pixel transformations" into oc-dev
Paul Duffin [Wed, 24 May 2017 08:34:06 +0000 (08:34 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a am:
c1f0962ea7 am:
4b6cf3d841
am:
7812f74234
Change-Id: Ia2ab8836781f3fa98782bc790fc76545c8eecb5a
Paul Duffin [Wed, 24 May 2017 08:27:56 +0000 (08:27 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a am:
c1f0962ea7
am:
4b6cf3d841
Change-Id: I0a4e360b01bf336b26a3a8ccdee200198cdfcb90
Michael Kwan [Wed, 24 May 2017 08:21:37 +0000 (08:21 +0000)]
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev am:
93a2f19f5f
am:
64f9d4089f
Change-Id: I4f3834c8d6067b922457fe7a713a5de343b7ff9a
Paul Duffin [Wed, 24 May 2017 08:19:09 +0000 (08:19 +0000)]
Merge "Fixed nfc-extras build files" am:
d3ff45985a
am:
c1f0962ea7
Change-Id: I562bec1735557ed6718da4004fdd54e822f1e7f3
Michael Kwan [Wed, 24 May 2017 08:14:07 +0000 (08:14 +0000)]
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev
am:
93a2f19f5f
Change-Id: I6bdb4e9b41af9330405577fb18123720038530d0
Paul Duffin [Wed, 24 May 2017 08:11:37 +0000 (08:11 +0000)]
Merge "Fixed nfc-extras build files"
am:
d3ff45985a
Change-Id: I4786af397c556c72d1f7ac9ff7d762fa3efcf90b
TreeHugger Robot [Wed, 24 May 2017 08:07:29 +0000 (08:07 +0000)]
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev
Paul Duffin [Wed, 24 May 2017 08:01:36 +0000 (08:01 +0000)]
Merge "Fixed nfc-extras build files"
Hugo Benichi [Wed, 24 May 2017 07:20:05 +0000 (07:20 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621 am:
ca9fcb79f6 am:
ecf4267889
am:
ea095c3e92
Change-Id: I5ca076ba73c470c301502a73e5cec66c6283b53d
Hugo Benichi [Wed, 24 May 2017 07:15:09 +0000 (07:15 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621 am:
ca9fcb79f6
am:
ecf4267889
Change-Id: Ib4e100fc8219b58ab7850407735a444dad3ec153
Hugo Benichi [Wed, 24 May 2017 07:07:11 +0000 (07:07 +0000)]
Merge "Move NsdServiceTest to correct directory" am:
0a76f99621
am:
ca9fcb79f6
Change-Id: Ia3f79fbcead21fdf4914b18905cd3b067ac7c806
Hugo Benichi [Wed, 24 May 2017 06:59:02 +0000 (06:59 +0000)]
Merge "Move NsdServiceTest to correct directory"
am:
0a76f99621
Change-Id: I37b614bec6dc4a9da55024c534dbfc9459e2764a
Treehugger Robot [Wed, 24 May 2017 06:47:29 +0000 (06:47 +0000)]
Merge "Move NsdServiceTest to correct directory"
Bill Yi [Wed, 24 May 2017 06:11:20 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc4e60acac93cc7e7971c2df13f79cf11c1017cc
Auto-generated-cl: translation import
Hugo Benichi [Wed, 24 May 2017 05:16:55 +0000 (14:16 +0900)]
Move NsdServiceTest to correct directory
Test: no functional change
Bug:
62044295
Change-Id: Iad3af646e8d252f84978d1a367878a78c2869982
Jaewan Kim [Wed, 24 May 2017 04:24:22 +0000 (04:24 +0000)]
Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev am:
31f6a3dc8b
am:
8603879526
Change-Id: I31e86c12b2df2d98cee514ce57d27da9c5e6beef
Jaewan Kim [Wed, 24 May 2017 04:17:40 +0000 (04:17 +0000)]
Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev
am:
31f6a3dc8b
Change-Id: I234a22a713b355876abb4917a16a0971a8cb9689
TreeHugger Robot [Wed, 24 May 2017 04:08:57 +0000 (04:08 +0000)]
Merge "TV PIP: Dismiss notification when the PIP is over" into oc-dev
Calin Juravle [Wed, 24 May 2017 03:00:42 +0000 (03:00 +0000)]
Merge "Re-pin camera odex/vdex files only if they have changed" into oc-dev am:
9bb5e16657
am:
9406962b55
Change-Id: I17b7fbf9e980241f8bb28997cc7d43687dc99d2b
Calin Juravle [Wed, 24 May 2017 02:55:08 +0000 (02:55 +0000)]
Merge "Re-pin camera odex/vdex files only if they have changed" into oc-dev
am:
9bb5e16657
Change-Id: I5d8be6100ad9ddb468a17422aca7f7ce872b19b9
TreeHugger Robot [Wed, 24 May 2017 02:49:04 +0000 (02:49 +0000)]
Merge "Re-pin camera odex/vdex files only if they have changed" into oc-dev
Jayachandran C [Wed, 24 May 2017 02:21:45 +0000 (02:21 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" am:
485d103083 am:
0223c80846 am:
0cf3baaf4c
am:
b21f01dcf9
Change-Id: I1046f028f57f2eba22686f73c5856761e639f376
Jayachandran C [Wed, 24 May 2017 02:14:17 +0000 (02:14 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" am:
485d103083 am:
0223c80846
am:
0cf3baaf4c
Change-Id: I0203529837a3db89b0c02eaf4ea5bc9bdb4596a1
Abodunrinwa Toki [Wed, 24 May 2017 02:11:39 +0000 (02:11 +0000)]
Merge "Make TextClassifier.getLinks(...) a default method." into oc-dev am:
d80e82f917
am:
4d0cf17e19
Change-Id: Ie3d738623f687497cafdc38bac06074b9a6337b0
Jayachandran C [Wed, 24 May 2017 02:09:09 +0000 (02:09 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" am:
485d103083
am:
0223c80846
Change-Id: I0fbddd65da2698eb8aa5291e3ed8e19af2924b1f
Abodunrinwa Toki [Wed, 24 May 2017 02:06:13 +0000 (02:06 +0000)]
Merge "Make TextClassifier.getLinks(...) a default method." into oc-dev
am:
d80e82f917
Change-Id: Icb9dd84d761f15b230c44ab55ac050750978cc8d
Jayachandran C [Wed, 24 May 2017 02:01:12 +0000 (02:01 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
am:
485d103083
Change-Id: I8e7c513b206cbc5f19d582ec48e529ce067e2aa9
Abodunrinwa Toki [Wed, 24 May 2017 01:57:46 +0000 (01:57 +0000)]
Merge "Make TextClassifier.getLinks(...) a default method." into oc-dev
Treehugger Robot [Wed, 24 May 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
TreeHugger Robot [Wed, 24 May 2017 01:36:19 +0000 (01:36 +0000)]
Merge "Close logging statement when stopping user"
Jaewan Kim [Wed, 24 May 2017 01:33:38 +0000 (01:33 +0000)]
Merge "Allow media apps to receive media key events after the phone call" into oc-dev am:
369438a23f
am:
177b739034
Change-Id: Ie544e336c7cb687f7fe9e6102852207dd73b7fb4
Jaewan Kim [Wed, 24 May 2017 01:28:37 +0000 (01:28 +0000)]
Merge "Allow media apps to receive media key events after the phone call" into oc-dev
am:
369438a23f
Change-Id: I229ddcbc289cfb5b88d1fe2c4524c568fab4fdf4
TreeHugger Robot [Wed, 24 May 2017 01:20:52 +0000 (01:20 +0000)]
Merge "Allow media apps to receive media key events after the phone call" into oc-dev
Jaewan Kim [Tue, 23 May 2017 09:34:07 +0000 (18:34 +0900)]
TV PIP: Dismiss notification when the PIP is over
This fixes the regression caused by the previous commit
bad26692d05 Set notification TAG and style in TV PIP notification
Bug:
37249867
Test: Manual test (PIP notification UI was dismissed after closing th
PIP by notification UI, or PIP controller dialog. Also checked that
the notification UI was dismissed after the the PIPed activity
becomes fullscreen.)
Change-Id: I4dc6d1ee8035f89583a5fb49aa6c8fdc40bb49a0
Calin Juravle [Tue, 23 May 2017 00:49:01 +0000 (17:49 -0700)]
Re-pin camera odex/vdex files only if they have changed
Test: Camera is re-pinned after
adb shell cmd package compile -f -m extract
com.google.android.GoogleCamera
adb shell cmd package bg-dexopt-job
Bug:
33168521
Change-Id: I5c5e76d1e40b6d433c9a0beba463c86f79ad437e
Jeff Davidson [Wed, 24 May 2017 01:01:25 +0000 (01:01 +0000)]
Merge "Declare new permission for Phone process."
John Reck [Wed, 24 May 2017 00:54:59 +0000 (00:54 +0000)]
Merge "Fix null deref crash" into oc-dev am:
c1affe14c2
am:
1f7f8bfddb
Change-Id: I0d82bb5d05f31e9a429517417a85d7c9fc9b2c60
John Reck [Wed, 24 May 2017 00:48:30 +0000 (00:48 +0000)]
Merge "Fix null deref crash" into oc-dev
am:
c1affe14c2
Change-Id: Ib8e4c34fb38400dc748b463c5ab965d57e260fd0
Amith Yamasani [Wed, 24 May 2017 00:47:12 +0000 (00:47 +0000)]
Merge "Don't keep a reference to Service object" into oc-dev am:
6c6d37d416
am:
1684ae9ba5
Change-Id: I7fac5ab76fac59386185612516cefaa90932662b
TreeHugger Robot [Wed, 24 May 2017 00:41:17 +0000 (00:41 +0000)]
Merge "Fix null deref crash" into oc-dev
Amith Yamasani [Wed, 24 May 2017 00:40:26 +0000 (00:40 +0000)]
Merge "Don't keep a reference to Service object" into oc-dev
am:
6c6d37d416
Change-Id: If9ba5155f62607fa744aa0892c50d26a9ab9f69b
TreeHugger Robot [Wed, 24 May 2017 00:31:37 +0000 (00:31 +0000)]
Merge "Don't keep a reference to Service object" into oc-dev
Fyodor Kupolov [Wed, 24 May 2017 00:26:41 +0000 (00:26 +0000)]
Merge "Updated NewDatabasePerformanceTests"
Eric Laurent [Wed, 24 May 2017 00:22:28 +0000 (00:22 +0000)]
Merge "audio service: fix rapid succession of A2DP devices connections" into oc-dev am:
8616a98d18
am:
beda612c57
Change-Id: Iedd794e5d695e8c4534f2ce664f0b647d1509224
Eric Laurent [Wed, 24 May 2017 00:15:48 +0000 (00:15 +0000)]
Merge "audio service: fix rapid succession of A2DP devices connections" into oc-dev
am:
8616a98d18
Change-Id: Ic0d684e4a5a1c8df7a48d7f891570540648b0875
Ben Lin [Wed, 24 May 2017 00:12:08 +0000 (00:12 +0000)]
Merge "Make BugreportStorageProvider subclass FileSystemProvider."
Eric Laurent [Wed, 24 May 2017 00:11:33 +0000 (00:11 +0000)]
Merge "audio service: fix rapid succession of A2DP devices connections" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 00:09:28 +0000 (00:09 +0000)]
Merge "Add change_overlay permission to systemui"
Jorim Jaggi [Wed, 24 May 2017 00:02:30 +0000 (00:02 +0000)]
Merge "Fix creating of app theme snapshots" into oc-dev am:
0418b72fd2
am:
216ddfa2cc
Change-Id: I130efb3f75e93d65de6f3c48c3cd99c312d61c94
Felipe Leme [Tue, 23 May 2017 23:55:59 +0000 (23:55 +0000)]
Merge "Hide Autofill UI when non-savable id is gone." into oc-dev am:
eee1dd26fa
am:
8f3455c59c
Change-Id: I71fb0e6f4e6befb0d94fcd2b3a04aeaac83c6654
Jorim Jaggi [Tue, 23 May 2017 23:47:54 +0000 (23:47 +0000)]
Merge "Fix creating of app theme snapshots" into oc-dev
am:
0418b72fd2
Change-Id: Ie78316a83a83ebb8a01698a74e01fda634a1d09f
Phil Weaver [Tue, 23 May 2017 23:46:31 +0000 (23:46 +0000)]
Merge "Make footer preferences non-clickable by default"
Felipe Leme [Tue, 23 May 2017 23:42:31 +0000 (23:42 +0000)]
Merge "Hide Autofill UI when non-savable id is gone." into oc-dev
am:
eee1dd26fa
Change-Id: Ifd88b9950acc09e82038ee1929c7932b4fd4261f
Fyodor Kupolov [Tue, 23 May 2017 23:41:51 +0000 (16:41 -0700)]
Close logging statement when stopping user
It was preventing db from closing.
Test: create guest user, remove. run dumpsys meminfo system
Bug:
36367545
Change-Id: I5508d237d67a0ed99e0316d74c8d84c9ffe26744
Bill Yi [Tue, 23 May 2017 23:35:59 +0000 (23:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
fbc7cc849f -s ours
am:
9b620f3a60 -s ours
Change-Id: I61a4a2de1285b58eeca8afadd9f9b61bc5b311a0
TreeHugger Robot [Tue, 23 May 2017 23:35:36 +0000 (23:35 +0000)]
Merge "Fix creating of app theme snapshots" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Hide Autofill UI when non-savable id is gone." into oc-dev
Bill Yi [Tue, 23 May 2017 23:27:40 +0000 (23:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
fbc7cc849f -s ours
Change-Id: Ie552fa0388e0114793fdef979ca7b4b07b103b5c
Adam Lesinski [Tue, 23 May 2017 23:25:22 +0000 (23:25 +0000)]
Merge "Resources: fix race with creating theme" into oc-dev am:
5f70bc89be
am:
006a6fa850
Change-Id: Iab03f37f7e63cb23401b27b8d54ea042e7f63df3
Android Build Merger (Role) [Tue, 23 May 2017 23:23:00 +0000 (23:23 +0000)]
Merge "Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
27918e7ff1" into oc-dev-plus-aosp am:
e1340bafce"
TreeHugger Robot [Tue, 23 May 2017 23:22:24 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Erik Wolsheimer [Tue, 23 May 2017 23:22:15 +0000 (23:22 +0000)]
Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
27918e7ff1" into oc-dev-plus-aosp
am:
e1340bafce
Change-Id: I711207026d2656e9f0baadda8261ae10f7a2969c
Android Build Merger (Role) [Tue, 23 May 2017 23:21:33 +0000 (23:21 +0000)]
Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
f61df4329b am:
49768c1391"
TreeHugger Robot [Tue, 23 May 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Adam Lesinski [Tue, 23 May 2017 23:19:26 +0000 (23:19 +0000)]
Merge "Resources: fix race with creating theme" into oc-dev
am:
5f70bc89be
Change-Id: I73bb76a7ff3fe6d3e0a974b5cbaed34c632ee8ae
Erik Wolsheimer [Tue, 23 May 2017 23:19:00 +0000 (23:19 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
f61df4329b
am:
49768c1391
Change-Id: I6cb0f54b0c045ddcdf07974bd93cffd4ec33ab06
Adam Lesinski [Tue, 23 May 2017 23:14:11 +0000 (23:14 +0000)]
Merge "Resources: fix race with creating theme" into oc-dev
Android Build Merger (Role) [Tue, 23 May 2017 23:13:39 +0000 (23:13 +0000)]
Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
27918e7ff1" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 23 May 2017 23:12:47 +0000 (23:12 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc
am:
27918e7ff1
Change-Id: I315e1b6638ea86d938643674031b9cef99764da5
Erik Wolsheimer [Tue, 23 May 2017 23:10:25 +0000 (23:10 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc
am:
f61df4329b
Change-Id: I4633607638c0c2a1ad05c76fc45eb6a894ff3202
Erik Wolsheimer [Tue, 23 May 2017 23:00:03 +0000 (23:00 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805
am:
94b497bccc
Change-Id: I62ab41ed83aa92b12e7fa3c9111a6f97e6ef13ef
Erik Wolsheimer [Tue, 23 May 2017 22:59:49 +0000 (22:59 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev am:
95e55f5020
am:
063a1a3ac0
Change-Id: I1b7d3e9e381da0db1ac04a849d0bb2047b8b8596
Erik Wolsheimer [Tue, 23 May 2017 22:58:57 +0000 (22:58 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805
am:
94b497bccc
Change-Id: I14f0b27d9d068df1defed18cd148ee331e0e876a
Erik Wolsheimer [Tue, 23 May 2017 22:51:29 +0000 (22:51 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev
am:
95e55f5020
Change-Id: I43e326ccc04534938c558f430ce4e2015347ac5e
Erik Wolsheimer [Tue, 23 May 2017 22:51:25 +0000 (22:51 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
am:
90a6054805
Change-Id: I708fda61e866a891238d6dbbfc6a9b901e6da6b3
TreeHugger Robot [Tue, 23 May 2017 22:46:43 +0000 (22:46 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 22:44:37 +0000 (22:44 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
Lucas Dupin [Tue, 23 May 2017 16:45:50 +0000 (09:45 -0700)]
Add change_overlay permission to systemui
SystemUI needs to be able to enable and disable
overlays in order to invert text and surface colors.
Bug:
38164700
Test: make
Change-Id: I7685d5fddb5a476e10012dab2d6e7ee5da206f80
John Reck [Tue, 23 May 2017 22:32:08 +0000 (15:32 -0700)]
Fix null deref crash
Change-Id: Ic1a64e926b5faa2f4cf8d079a2b67e0261dcecd7
Fixes:
62035692
Test: manual
TreeHugger Robot [Tue, 23 May 2017 21:27:37 +0000 (21:27 +0000)]
Merge "AAPT2: improve some error messages"
TreeHugger Robot [Tue, 23 May 2017 21:26:57 +0000 (21:26 +0000)]
Merge "Validating non-empty authority and accountType"
TreeHugger Robot [Tue, 23 May 2017 21:26:29 +0000 (21:26 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff"
Jorim Jaggi [Tue, 23 May 2017 13:07:44 +0000 (15:07 +0200)]
Fix creating of app theme snapshots
Apparently locking a HW bitmap makes it super slow to draw.
Instead, draw it into a bitmap, copy it into a hw bitmap, and then
extract the GraphicBuffer.
Test: Open Camera, go home, reopen camera (and maybe go to recents)
Change-Id: Id2371dcdad95f07a680e6c56c0403b3ad815a3f3
Fixes:
38510859
Michael Kwan [Tue, 23 May 2017 01:13:13 +0000 (18:13 -0700)]
Fix crash due to bad maxLines defined for dialog titles on watch type devices.
Misuse of @empty which explicitly sets the value to null, and should only be used
for objects. Replaced with @null which more accurately means undefined value.
Bug:
38431435
Change-Id: I6a59fc52c2ef9626c561f5bc344c588d22111f6e
Bill Yi [Tue, 23 May 2017 21:18:00 +0000 (14:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64e965e64592f8a674b099022977a6cf5f26ff79
Auto-generated-cl: translation import
Bill Yi [Tue, 23 May 2017 21:13:08 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib11b047a4d99ef4ab18b3c2524020fd109bfaab4
Auto-generated-cl: translation import
Ruthwar Kumar Ambeer [Tue, 23 May 2017 21:08:48 +0000 (21:08 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2 am:
96926cac25 am:
c6845e017a
am:
cb556d0bfd
Change-Id: I23257271abc26bb6adc9966f7fceb24cc0fbd435
Jayachandran C [Thu, 18 May 2017 06:53:59 +0000 (23:53 -0700)]
Fix up upstream interface types for case DUN_UNSPECIFIED
The existing logic will add TYPE_MOBILE and TYPE_MOBILE_HIPRI
even if the carrier config has TYPE_DUN for DUN_UNSPECIFIED.
A check is added not to modify the upstream interface types
if there is already a cellular interface type. Add TYPE_MOBILE
and TYPE_MOBILE_HIPRI if there is no cellular types found.
Test: Hotspot on Verizon and T-Mobile US.
Verified the requestNetwork has the DUN capability.
Bug:
38186915
Change-Id: I74fc5c791fee2885bf66df8975e92c2b48f1668c
Jayachandran Chinnakkannu [Tue, 23 May 2017 21:01:18 +0000 (21:01 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev am:
be67aefca2
am:
128898d7e1
Change-Id: I81a0007d4865b23862879b23900d6bd65eb92af5
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:57:05 +0000 (20:57 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2 am:
96926cac25
am:
c6845e017a
Change-Id: Ifd84c571e83da3dca1ef87805506570e41caad16
Jayachandran Chinnakkannu [Tue, 23 May 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev
am:
be67aefca2
Change-Id: Ibfee591728c5cf01d8e11b7ccf2418194d398b59
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:50:12 +0000 (20:50 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2
am:
96926cac25
Change-Id: I663415938196335bd27d9172b59d5f169a0609e3
Jorim Jaggi [Tue, 23 May 2017 20:45:10 +0000 (20:45 +0000)]
Merge "Fix starting window leak when adding/removing quickly" into oc-dev am:
3047a5ea7a
am:
fc7ecb368a
Change-Id: I05daa5e25e944214a5844b9c011a60926535ed6a
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
am:
65d3a457d2
Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
Jayachandran Chinnakkannu [Tue, 23 May 2017 20:42:41 +0000 (20:42 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev
Jorim Jaggi [Tue, 23 May 2017 20:38:10 +0000 (20:38 +0000)]
Merge "Fix starting window leak when adding/removing quickly" into oc-dev
am:
3047a5ea7a
Change-Id: I0cd5b402d00c6b201d2ba598606d292d83c52e4d
OSDN Git Service
