OSDN Git Service
Jean-Michel Trivi [Thu, 12 Jul 2018 22:59:41 +0000 (15:59 -0700)]
Merge "Audio assets: add NFC sounds" am:
5cb7cd68a0
am:
8df8455384
Change-Id: I11d6eba4ca5e888e71e91fdef2d7dd8383391ec8
Jack Yu [Thu, 12 Jul 2018 22:52:35 +0000 (15:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state"" am:
1cbcc50d0a -s ours
am:
2016ffc9ec
Change-Id: I037d2b66b69b9a968a076888fcd74b178448809b
Jorim Jaggi [Thu, 12 Jul 2018 22:09:20 +0000 (15:09 -0700)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
am:
650ead619e
Change-Id: I6d4300530516c25a5eb9af8ea8f924591eff3b95
Winson Chung [Thu, 12 Jul 2018 21:46:31 +0000 (14:46 -0700)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
am:
7775af2778
Change-Id: I54d224436509531cfd0e33cce97d8471c0867447
Jean-Michel Trivi [Thu, 12 Jul 2018 21:36:35 +0000 (14:36 -0700)]
Merge "Audio assets: add NFC sounds"
am:
5cb7cd68a0
Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
Jorim Jaggi [Thu, 12 Jul 2018 21:32:53 +0000 (21:32 +0000)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
Bill Yi [Thu, 12 Jul 2018 21:31:15 +0000 (14:31 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04
am:
4ab42d5b8a
Change-Id: I5afb90731ccdc2afc1df7c9ac45f9efaa0820ac5
Bill Yi [Thu, 12 Jul 2018 21:16:01 +0000 (14:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours am:
f85971f3a2 -s ours
am:
698e7ebb0b -s ours
Change-Id: I005a54804323515e99552fc4bde76bc079d78f35
Bill Yi [Thu, 12 Jul 2018 20:57:24 +0000 (13:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours
am:
5bf0d3e61c -s ours
Change-Id: I1ee3b8540dec46bdd7e9539b469567f498ddd68f
Jack Yu [Thu, 12 Jul 2018 20:52:49 +0000 (13:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state""
am:
1cbcc50d0a -s ours
Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
Winson Chung [Thu, 12 Jul 2018 20:46:44 +0000 (20:46 +0000)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
Bill Yi [Thu, 12 Jul 2018 20:37:57 +0000 (13:37 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0
am:
d9bd9d1c04
Change-Id: Id7b15870681b4971920a36db92198bb32d92ef51
Bill Yi [Thu, 12 Jul 2018 20:27:05 +0000 (13:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours
am:
f85971f3a2 -s ours
Change-Id: I0891178936b34370816eb9c15fd4103ecee586cc
Nathan Harold [Thu, 12 Jul 2018 20:26:41 +0000 (13:26 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d
am:
f5f908c525
Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0
Bill Yi [Thu, 12 Jul 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours
am:
847b7d112e -s ours
Change-Id: I236fce4894fa4dda79e34ed191560598dcd2a4c4
Bill Yi [Thu, 12 Jul 2018 20:17:45 +0000 (13:17 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856
am:
262d6935a0
Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19
Bill Yi [Thu, 12 Jul 2018 20:10:22 +0000 (13:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours
am:
afb05522f1 -s ours
Change-Id: I92e39d42756e8d5d7f517802ddbdc8e539024d88
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
Bill Yi [Thu, 12 Jul 2018 19:47:58 +0000 (12:47 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
am:
71bd839856
Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be
Bill Yi [Thu, 12 Jul 2018 19:45:19 +0000 (12:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
am:
0c31d81cd1 -s ours
Change-Id: I404ba441a96f77be638d89c0c43f950200a94376
Jean-Michel Trivi [Thu, 12 Jul 2018 19:41:51 +0000 (19:41 +0000)]
Merge "Audio assets: add NFC sounds"
Bill Yi [Thu, 12 Jul 2018 19:41:11 +0000 (12:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
am:
9935787f3b -s ours
Change-Id: I1ef782ee8a7ed8da6baed44c052f1fa3a08c1af4
Nathan Harold [Thu, 12 Jul 2018 19:35:18 +0000 (12:35 -0700)]
Merge "Remove Duplicate Override for Operator Alphas"
am:
24eaa6ab3d
Change-Id: I15004a7df3d922ba50d187769299723e888febae
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Import translations. DO NOT MERGE
Jordan Liu [Thu, 12 Jul 2018 18:56:50 +0000 (11:56 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5
am:
e5c77fc978
Change-Id: I42a6e604ff65bbb77d0f23c584722c1ea44038e6
Jordan Liu [Thu, 12 Jul 2018 18:46:32 +0000 (11:46 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read"
am:
0beefc0af5
Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
Neil Fuller [Thu, 12 Jul 2018 18:42:14 +0000 (11:42 -0700)]
Merge "Move XML object factory logic to libcore" am:
8176fb99e1
am:
7add22db60
Change-Id: If395891203fae0a8b55f8f58430adc979b758db2
Jack Yu [Thu, 12 Jul 2018 18:35:03 +0000 (11:35 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours
am:
6af5ddcc4a
Change-Id: I7ea119e9f8d580e18efa56f1cfa3be4c86c18bea
Neil Fuller [Thu, 12 Jul 2018 18:26:03 +0000 (11:26 -0700)]
Merge "Move XML object factory logic to libcore"
am:
8176fb99e1
Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
Jack Yu [Thu, 12 Jul 2018 18:21:11 +0000 (11:21 -0700)]
[automerger skipped] Merge "Added documentation for network registration state"
am:
c51397b161 -s ours
Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
Jack Yu [Thu, 12 Jul 2018 18:16:26 +0000 (18:16 +0000)]
Merge "Revert "Added documentation for network registration state""
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
Wale Ogunwale [Wed, 11 Jul 2018 22:22:01 +0000 (15:22 -0700)]
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/
2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes:
111336376
Test: builds
chened [Thu, 12 Jul 2018 17:53:26 +0000 (10:53 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
am:
26da9f18ed
Change-Id: I68975212f84e6e31c2dffb002749d2ec735689b5
Donghui Han [Thu, 12 Jul 2018 17:47:53 +0000 (10:47 -0700)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev
am:
2fca393cc1
Change-Id: I77b6b8e6d469a9e28478ddd7975f9c065caef20b
Jack Yu [Thu, 12 Jul 2018 17:39:12 +0000 (17:39 +0000)]
Revert "Added documentation for network registration state"
This reverts commit
b4094993f742fbe9d07bd5783030aa82a3045f79.
Reason for revert: Caused merge conflict. Need to come up with a better solution.
Change-Id: Id7b7f35c25775a7a095b77a90724cf3a0f8daf7e
Jordan Liu [Thu, 12 Jul 2018 17:36:15 +0000 (17:36 +0000)]
Merge "WRITE_APN_SETTINGS is also required to read"
TreeHugger Robot [Thu, 12 Jul 2018 17:26:37 +0000 (17:26 +0000)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
Donghui Han [Thu, 12 Jul 2018 17:19:36 +0000 (17:19 +0000)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev
Treehugger Robot [Thu, 12 Jul 2018 13:46:56 +0000 (13:46 +0000)]
Merge "Move XML object factory logic to libcore"
Jorim Jaggi [Thu, 12 Jul 2018 11:55:08 +0000 (13:55 +0200)]
DO NOT MERGE Remove WTF spam
Root cause has been identified, but fix is too risky. Instead, we
remove the WTF for now and readd the fix as well as the WTF
in master.
Note that due to defensive programming, in case we land in the WTF
case, it doesn't cause any real bug.
Test: boots
Bug:
110834518
Change-Id: I0da1e48e420c3fcde0e818b7fe0527da9155a159
Neil Fuller [Thu, 12 Jul 2018 09:00:02 +0000 (02:00 -0700)]
Remove unnecessary libcore includes
am:
23a97d8d46
Change-Id: Ic13bcf0477fecd609db8224dc8f9298fa94fa7f9
Neil Fuller [Tue, 10 Jul 2018 14:18:58 +0000 (15:18 +0100)]
Remove unnecessary libcore includes
This commit removes includes that don't appear to be needed.
Test: build
Bug:
111055375
Merged-In: Ia660abcf992c4acd8709d217116f895b07d9c61c
Change-Id: Ia660abcf992c4acd8709d217116f895b07d9c61c
(cherry picked from commit
fa956d5d722dd600ed429f02c55e796f9dc2c772)
Jack Yu [Thu, 12 Jul 2018 02:28:32 +0000 (02:28 +0000)]
Merge "Added documentation for network registration state"
Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:59 +0000 (01:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
Change-Id: I444e7a4567e0319e0a1999ca1a83418b14812d5d
Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:52 +0000 (01:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83
Change-Id: I119e6fba2ffa56ca9a8b24df821025abf4bf9580
Bill Yi [Thu, 12 Jul 2018 01:50:30 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I989a9b371c1dc0c713b67c0a8cef4f3bdc0c457c
Auto-generated-cl: translation import
Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:09 +0000 (23:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
Change-Id: Ib3e6c7f2885ac23d45a68e7e20d981969067eb3b
Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:02 +0000 (23:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Change-Id: I37e47c3e87c8e9143731af2b4bf0d92fc4ce7f38
Bill Yi [Wed, 11 Jul 2018 23:42:32 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9878d930e5aa4e4fe1883f28063e167240bb99b5
Auto-generated-cl: translation import
Arun Rathi [Wed, 11 Jul 2018 23:30:50 +0000 (16:30 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market" am:
57df2a333f
am:
cdac4d77f6
Change-Id: Iacc41524d575e1dd4c179ab81e7fa374ee096e5b
Arun Rathi [Wed, 11 Jul 2018 23:08:33 +0000 (16:08 -0700)]
Merge "Add Channel 50 (area update info) support for LAM market"
am:
57df2a333f
Change-Id: I28ece8be0f12979bd037337c87df1ce8fd05c331
Android Build Merger (Role) [Wed, 11 Jul 2018 22:10:09 +0000 (22:10 +0000)]
Merge "Merge "Disable LTO on -eng" am:
1918b39942 am:
af3e763358" into pi-dev-plus-aosp
John Reck [Wed, 11 Jul 2018 22:09:34 +0000 (15:09 -0700)]
Merge "Disable LTO on -eng" am:
1918b39942
am:
af3e763358
Change-Id: I5146424fc06ad7c62088a0ac6f957e0a02b0ec66
Arthur Ishiguro [Wed, 11 Jul 2018 22:07:23 +0000 (15:07 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e am:
bf8733b162 am:
e9b67d2b22
am:
267b960dab
Change-Id: I78fff5a76a8e1215e3a4235cbe65cc95d0fb8653
Treehugger Robot [Wed, 11 Jul 2018 21:52:01 +0000 (21:52 +0000)]
Merge "Add Channel 50 (area update info) support for LAM market"
John Reck [Wed, 11 Jul 2018 21:48:50 +0000 (14:48 -0700)]
Merge "Disable LTO on -eng"
am:
1918b39942
Change-Id: I925182b722d7bf6b1bb63c298a8ec9e345f0c4ac
Arthur Ishiguro [Wed, 11 Jul 2018 21:40:57 +0000 (14:40 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e am:
bf8733b162
am:
e9b67d2b22
Change-Id: Ia3222d7b97b2d1083404d607738fc15d2646999c
Arthur Ishiguro [Wed, 11 Jul 2018 21:27:45 +0000 (14:27 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e
am:
bf8733b162
Change-Id: I4fe6469031d7ef6fcc6d9b46da4dbc5845ea62d2
Arthur Ishiguro [Wed, 11 Jul 2018 21:13:30 +0000 (14:13 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2
am:
cab2fa779e
Change-Id: Ifdd69396d202951f8b9ed5fe6e5766133955a5e5
Treehugger Robot [Wed, 11 Jul 2018 20:21:19 +0000 (20:21 +0000)]
Merge "Disable LTO on -eng"
Nathan Harold [Wed, 11 Jul 2018 19:19:19 +0000 (12:19 -0700)]
[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am:
c1e5c3ea82
am:
22590b06e8 -s ours
Change-Id: Id9ad6c651594b9ed1306657ab3bcb53278a566e1
Nathan Harold [Wed, 11 Jul 2018 19:09:10 +0000 (12:09 -0700)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am:
c1e5c3ea82
Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5
John Reck [Wed, 11 Jul 2018 18:21:09 +0000 (11:21 -0700)]
Disable LTO on -eng
Speeds up incremental compile of one cpp file change
from over a minute to around 15 seconds
Bug:
111277863
Test: touch a .cpp file in hwui & mmm
Change-Id: I946ecad411a7a59f87ed9e1eeb146d6f57bd038a
Jack Yu [Wed, 6 Jun 2018 00:38:56 +0000 (17:38 -0700)]
Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.
Bug:
73659459
Test: Build
Change-Id: Ia7b4a53070c06edd98ae767fd6f56c4000d8e4d0
Nathan Harold [Wed, 11 Jul 2018 17:58:50 +0000 (17:58 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
Bill Yi [Wed, 11 Jul 2018 17:53:56 +0000 (10:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
b9ed290b01 -s ours
Change-Id: I2f6671ada5f0758346cd006dd9f2404b3f4a0a63
TreeHugger Robot [Wed, 11 Jul 2018 17:47:36 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Donghui Han [Tue, 10 Jul 2018 23:32:39 +0000 (16:32 -0700)]
camera2: Treat face detect mode larger than FULL as FULL
This change treats any face detect mode larger than FULL mode
in the capture result as FULL mode. So in case the face detect
mode is larger than FULL, it is assumed that the FULL mode
STATISTICS_FACE is supported in the capture result.
Bug:
111131913
Test: CTS, GCA
Change-Id: I3a6a29ce8d9d8ab66918baaea3162797e18276d2
Neil Fuller [Tue, 10 Jul 2018 17:41:19 +0000 (18:41 +0100)]
Move XML object factory logic to libcore
It makes sense to hide the details of the parser implementation
(and other similar objects) in libcore so it could be changed.
This change removes the "ExpatPerformanceTest" which appears not to have
been maintained and was comparing KxmlParser with itself. It is assumed
that android.util.Xml used to return the expat parser.
Test: build
Bug:
111055375
Merged-In: Ibad247323ba90cd949aecb2bd92f2f73306a4327
Change-Id: Ibad247323ba90cd949aecb2bd92f2f73306a4327
David Brazdil [Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)]
resolve merge conflicts of
6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am:
f8d22dec87
Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7
Jorim Jaggi [Wed, 11 Jul 2018 12:22:34 +0000 (05:22 -0700)]
Merge "Send interaction hint when starting window animation" into pi-dev
am:
3f4232a801
Change-Id: Ie39b514828d7b751d4d9356e1cde32ad44485e68
Jorim Jaggi [Wed, 11 Jul 2018 12:10:29 +0000 (12:10 +0000)]
Merge "Send interaction hint when starting window animation" into pi-dev
David Brazdil [Wed, 11 Jul 2018 10:56:34 +0000 (11:56 +0100)]
resolve merge conflicts of
6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
David Brazdil [Wed, 11 Jul 2018 09:18:15 +0000 (09:18 +0000)]
Merge "Compile android.test.*.stubs into dex"
Arun Rathi [Wed, 27 Jun 2018 12:04:41 +0000 (14:04 +0200)]
Add Channel 50 (area update info) support for LAM market
Add Channel 50 (area update info) support for LAM market.
Below is the list of MCC MNC:
MCC MNC 334 030 /334 03 (Movistar MX)
MCC MNC 722 07 (Movistar AR)
MCC MNC 732 123 (Movistar CO)
MCC MNC 740 00 (Movistar EC)
MCC MNC 712 04 (Movistar CR)
MCC MNC 706 04 (Movistar SV)
MCC MNC 704 03 (Movistar GT)
MCC MNC 716 17 (Entel PE)
MCC MNC 716 06 (Movistar PE)
MCC MNC 716 10 (Claro PE)
Bug:
111260033
Test: Manual
Change-Id: I2fe53cbfd103140125422e28723280ada7522cd1
Salvador Martinez [Wed, 11 Jul 2018 01:40:02 +0000 (18:40 -0700)]
Merge "Only query for estimate on battery level change" into pi-dev
am:
729bfdf9a8
Change-Id: I7a7ec3965bc19f1f62428ea0737b6263d079dd02
Colin Cross [Wed, 11 Jul 2018 01:10:57 +0000 (18:10 -0700)]
Mark installable jars with installable: true
am:
d7647c1b66
Change-Id: If2f6daf0457bae822d88a762ef79f0162ded6ebe
TreeHugger Robot [Wed, 11 Jul 2018 00:43:02 +0000 (00:43 +0000)]
Merge "Only query for estimate on battery level change" into pi-dev
Bill Yi [Wed, 11 Jul 2018 00:34:55 +0000 (17:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ice16b70aac3532e8a2ba725315868dc6d60c4fde
Jean-Michel Trivi [Wed, 11 Jul 2018 00:32:11 +0000 (17:32 -0700)]
Audio assets: add NFC sounds
Add audio assets for NFC events.
Add new audio package that includes the NFC sounds in the UI "sound
effects"
Bug:
80405985
Test: use AudioPackage14 in device build, verify NFC sounds are under system/media/audio/ui
Change-Id: Ifdb79286ad4ba083a5515402f8d3e62e0ba61c3f
Salvador Martinez [Wed, 4 Jul 2018 01:07:07 +0000 (18:07 -0700)]
Only query for estimate on battery level change
SysUI is querying for an estimate too much, this change gates
it on being the first estimate or the battery level having
changed so that we don't waste system resources.
Test: atest PowerUITest
Bug:
110259498
Change-Id: I6fb5c08d6388e463d6216de41b3fd49bbc489b81
Colin Cross [Tue, 10 Jul 2018 21:24:31 +0000 (14:24 -0700)]
Mark installable jars with installable: true
Most jars don't need to be installed on the device. Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.
Bug:
110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
Nathan Harold [Tue, 10 Jul 2018 20:38:23 +0000 (13:38 -0700)]
Remove Duplicate Override for Operator Alphas
These methods override the base class methods
and don't actually add any value. Removing them
as redundant.
Bug:
76153768
Test: telephony unit test - testCellIdentityTdscdma()
Change-Id: I98200a7198e182e6279851c51082bf625ee09fe9
Nathan Harold [Wed, 28 Mar 2018 15:39:43 +0000 (08:39 -0700)]
Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.
Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.
-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
the getLevel() methods of CellSignalStrength<RAT>
Bug:
76153768
Test: RILTests added for TDSCDMA
Merged-In: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
(cherry picked from commit
88f44024bb068829358d66107360223dc73131f7)
Nathan Harold [Tue, 10 Jul 2018 19:57:15 +0000 (19:57 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
Mathew Inwood [Tue, 10 Jul 2018 18:51:02 +0000 (11:51 -0700)]
Merge "Add build rule for API->source mapping." am:
b4919259ab
am:
4500790a81
Change-Id: Idc214d73fcf555ac15f865cc9be60909399170f8
Mathew Inwood [Tue, 10 Jul 2018 18:41:48 +0000 (11:41 -0700)]
Merge "Add build rule for API->source mapping."
am:
b4919259ab
Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
Jordan Liu [Tue, 10 Jul 2018 18:24:42 +0000 (11:24 -0700)]
WRITE_APN_SETTINGS is also required to read
Add documentation explaining this.
Bug:
110033164
Test: no change to behavior
Change-Id: I4b69e5e36c9e05cf14c999e4a5bb1664a02e82f3
Michael Wachenschwanz [Tue, 10 Jul 2018 17:48:55 +0000 (10:48 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am:
62d5e041a2 -s ours
am:
ccee79d9ce -s ours
Change-Id: Ic27debc1b021a77de57e384df7dba0f1d9209df8
Michael Wachenschwanz [Tue, 10 Jul 2018 17:36:25 +0000 (10:36 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am:
62d5e041a2 -s ours
Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f
Mathew Inwood [Tue, 10 Jul 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Add build rule for API->source mapping."
Colin Cross [Tue, 10 Jul 2018 16:29:55 +0000 (09:29 -0700)]
Merge "Mark installable jars with installable: true" am:
1035f48f61
am:
19609a7993
Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c
Treehugger Robot [Tue, 10 Jul 2018 16:24:47 +0000 (16:24 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"
Colin Cross [Tue, 10 Jul 2018 16:12:46 +0000 (09:12 -0700)]
Merge "Mark installable jars with installable: true"
am:
1035f48f61
Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
Colin Cross [Tue, 10 Jul 2018 14:51:50 +0000 (14:51 +0000)]
Merge "Mark installable jars with installable: true"
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex
Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.
Bug:
79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Merged-In: I1d0850b18044c559ea4b9893d929dc45884b32c3
Change-Id: Ief28cd5e6d0cdd58f22fab751e0173ccf8c69a0c
Julia Reynolds [Tue, 10 Jul 2018 13:03:42 +0000 (06:03 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev
am:
f00bfbe46e
Change-Id: I6c999a970a309f7888d6157c7a17f5d0ca05e32c
Julia Reynolds [Tue, 10 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge "Be more strict about triggering notification lights" into pi-dev
Olivier Gaillard [Tue, 10 Jul 2018 08:59:32 +0000 (01:59 -0700)]
Merge "Add a getTransactionName method to Binder." am:
079f03f584
am:
06aa142232
Change-Id: I4695382d0c3e6489428a3178326630c655c3f0d5
OSDN Git Service
