Commits · 6a7f167f67586921d372121327087e492da60188 · Farzin Kazemzadeh / platform_frameworks_base-old

Mar 21, 2018

docs: fixing bug 36982027 and 30636712, typos · 6a7f167f

kopriva authored 7 years ago

Test: make ds-docs

Bug: 36982027
Bug: 30636712

Change-Id: I70d6d216c714a31b7e762a203a27f6124642131e

6a7f167f

Mar 19, 2018

docs: fixing typo, bug 36909553 · 4dddc63e

kopriva authored 7 years ago

Test: make ds-docs

Bug: 36909553
Change-Id: I6e6842fe555690d97b954c370b777b25c6f5e54e

4dddc63e

Mar 15, 2018

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev am: 38860f2c · 3b028579
Wyatt Riley authored 7 years ago
```
am: 4b8765ff

Change-Id: Ib91a39ae254922ae56b2911c29b86679d4dd16fb
```
3b028579
Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev · 4b8765ff
Wyatt Riley authored 7 years ago
```
am: 38860f2c

Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934
```
4b8765ff

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 9dadab0c

Marco Nelissen authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3 am: c077fab8 skipped: 1160018f am: 957e6ff8  -s ours
am: 10dd3213  -s ours

Change-Id: I1b97c296b4e205f22eef83a34512bd16e8b6464a

9dadab0c

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev · 38860f2c

TreeHugger Robot authored 7 years ago

* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457f skipped: d3ef1376
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457f
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil

38860f2c

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 10dd3213

Marco Nelissen authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3 am: c077fab8 skipped: 1160018f
am: 957e6ff8  -s ours

Change-Id: I0eed35a22a6e3186d8dc37fb2bae76fcbbe0d5ff

10dd3213

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 957e6ff8

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3 am: c077fab8 skipped: 1160018f

Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f

957e6ff8

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 1160018f

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3 am: c077fab8

Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd

1160018f

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · c077fab8

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d am: 6100f6d3

Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0

c077fab8

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 6100f6d3

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5 am: 31ee079d

Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2

6100f6d3

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 31ee079d

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6 am: 4ef2cbc5

Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3

31ee079d

[automerger] DO NOT MERGE Rework thumbnail cleanup am: am:... · 4ef2cbc5

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 skipped: 9d13b0f6

Change-Id: Ib29c785708e959391b3e388b453147e94037420f

4ef2cbc5

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 am: 019eec39 · 9d13b0f6
Android Build Merger (Role) authored 7 years ago
```
Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52
```
9d13b0f6
[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b am: b8dad6c6 · 019eec39
Android Build Merger (Role) authored 7 years ago
```
Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603
```
019eec39
[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b · b8dad6c6
Android Build Merger (Role) authored 7 years ago
```
Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608
```
b8dad6c6

DO NOT MERGE Rework thumbnail cleanup · b514ce9b

Marco Nelissen authored 7 years ago

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

b514ce9b

Mar 14, 2018

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 25d38a56

Alan Viverette authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9 am: a982645d skipped: 9d3e2287 am: 8a095b5f
am: 0886b1a7

Change-Id: I6fb6521317ef9d9e2d6afab056bc8993bed9720c

25d38a56

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 0886b1a7

Alan Viverette authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9 am: a982645d skipped: 9d3e2287
am: 8a095b5f

Change-Id: I6eb246ce670723e1f21ee4cf45d5c5e48b91f1ce

0886b1a7

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 8a095b5f

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9 am: a982645d skipped: 9d3e2287

Change-Id: I1ce639a3ea40693d82501861d4b81afd3506b37d

8a095b5f

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 9d3e2287

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9 am: a982645d

Change-Id: I329294b80015cbfb2c498c0752b340cbaf527735

9d3e2287

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · a982645d

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9

Change-Id: I927087da2df9ad993b449d8ec9b90bd641088d75

a982645d

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 4f83bad9

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2

Change-Id: I7204eee21fc2620f70dc8bc534aa0160d947ab7e

4f83bad9

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · f98157e2

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229

Change-Id: I916228fb05914dbb89551a27418f746305a01ed6

f98157e2

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · e32e8229

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5

Change-Id: Ie516029e98d07f4ebb6916d75af625c92e711fde

e32e8229

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · 93f8bfa5

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493

Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde

93f8bfa5

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... · d0fcb493

Android Build Merger (Role) authored 7 years ago

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a

Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e

d0fcb493

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 · 1b6f3f9a
Android Build Merger (Role) authored 7 years ago
```
Change-Id: I87dcb4ce2fc52e0ed6ce5f79d15ab49084d088e3
```
1b6f3f9a
DO NOT MERGE Fix build with SDK 24-like implementation of constructor · f3c2e0b3
Alan Viverette authored 7 years ago
```
Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54
```
f3c2e0b3

Mar 13, 2018

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to... · 60f40b9f

Android Build Merger (Role) authored 7 years ago

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457f skipped: d3ef1376

Change-Id: I166bdfa211911d3f3ebcc03af1e9c98edc54d8fc

60f40b9f

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to... · d3ef1376

Android Build Merger (Role) authored 7 years ago

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457f

Change-Id: Ifd4e09852646522a10971a38cf43ec1282d79dad

d3ef1376

DO NOT MERGE: Restoring Network Available Notification to AGnssRil · 3656457f

Wyatt Riley authored 8 years ago

Adds connectivity notification back for SUPL specific
case, needed esp. for case where WiFi is off and a
general purpose connectivity notification doesn't fire.

Bug: 33350903
Fixes: 33350903
Test: On device GPS-still-works checked, as well as notifications
      going into HAL on airplane mode on/off, and SUPL call flows
      (Further AGnssRil check to be done by partners)

Change-Id: I02af0b839d0bfd21dfefedff743208e02ab9c2dd
(cherry picked from commit 41f6bceb)

3656457f

[automerger] Rework thumbnail cleanup am: skipped: am:... · 21e5aeef

Marco Nelissen authored 7 years ago

[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b am: 16ee12ac am: d08bb4b1 am: b3f50c9c  -s ours
am: b50ae71d  -s ours

Change-Id: Ic18f8e6449d4310924bac6a40acff9df4d743dc6

21e5aeef

[automerger] Rework thumbnail cleanup am: skipped: am:... · b50ae71d

Marco Nelissen authored 7 years ago

[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b am: 16ee12ac am: d08bb4b1
am: b3f50c9c  -s ours

Change-Id: I1b214134e879310733ee40b138c29cfc0a78b32e

b50ae71d

[automerger] Rework thumbnail cleanup am: skipped: am:... · b3f50c9c

Android Build Merger (Role) authored 7 years ago

[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b am: 16ee12ac am: d08bb4b1

Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac

b3f50c9c

[automerger] Rework thumbnail cleanup am: skipped: am:... · d08bb4b1

Android Build Merger (Role) authored 7 years ago

[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b am: 16ee12ac

Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd

d08bb4b1

[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e am: 6720ea0b · 16ee12ac
Android Build Merger (Role) authored 7 years ago
```
Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295
```
16ee12ac
[automerger] Rework thumbnail cleanup am: 0dc23f95 skipped: 75767d1e · 6720ea0b
Android Build Merger (Role) authored 7 years ago
```
Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4
```
6720ea0b
[automerger] Rework thumbnail cleanup am: 0dc23f95 · 75767d1e
Android Build Merger (Role) authored 7 years ago
```
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
```
75767d1e

Rework thumbnail cleanup · 0dc23f95

Marco Nelissen authored 7 years ago

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

0dc23f95