OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak." am:...
Hans Boehm [Fri, 1 Dec 2017 15:56:23 +0000 (15:56 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak." am: db122f90d9
am: 4fc1bb0e37

Change-Id: I949a3896f7613fe8bd3d92badba0fea5b3343e39

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
Hans Boehm [Fri, 1 Dec 2017 15:46:09 +0000 (15:46 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."
am: db122f90d9

Change-Id: Ibc470d844139fd2f74434a26d01903c67eb51f86

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
Hans Boehm [Fri, 1 Dec 2017 15:34:29 +0000 (15:34 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."

6 years agoMerge "Build overlaytests as part of the normal build" am: ce2362fc7d
Paul Duffin [Fri, 1 Dec 2017 10:35:20 +0000 (10:35 +0000)]
Merge "Build overlaytests as part of the normal build" am: ce2362fc7d
am: 08d7ee4111

Change-Id: Ie4c50aa2447316edb1c02e1f65dcacf35c24d5f0

6 years agoMerge "Build overlaytests as part of the normal build"
Paul Duffin [Fri, 1 Dec 2017 10:26:30 +0000 (10:26 +0000)]
Merge "Build overlaytests as part of the normal build"
am: ce2362fc7d

Change-Id: I11c3b75763f5bd5c8c4239d9a5135da7e18df03f

6 years agoMerge "Build overlaytests as part of the normal build"
Paul Duffin [Fri, 1 Dec 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Build overlaytests as part of the normal build"

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc
Cassie [Fri, 1 Dec 2017 05:40:36 +0000 (05:40 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc
am: 3ba72e7130

Change-Id: I426e70c17a222773267b0c482c930ccdb0c20b4a

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Cassie [Fri, 1 Dec 2017 05:30:06 +0000 (05:30 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am: 298d2a46dc

Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Treehugger Robot [Fri, 1 Dec 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."

6 years agoMerge changes I80504f43,Ifc372eef am: de7be840a7
Calin Juravle [Fri, 1 Dec 2017 01:43:30 +0000 (01:43 +0000)]
Merge changes I80504f43,Ifc372eef am: de7be840a7
am: 991da81069

Change-Id: I7adfdd87dc63d5ab3a34e152cf1066f4498036e8

6 years agoMerge changes I80504f43,Ifc372eef
Calin Juravle [Fri, 1 Dec 2017 01:33:54 +0000 (01:33 +0000)]
Merge changes I80504f43,Ifc372eef
am: de7be840a7

Change-Id: Id86c979498e13f5e382c5a448becee8f7bfe72f0

6 years agoMerge changes I80504f43,Ifc372eef
Treehugger Robot [Fri, 1 Dec 2017 01:09:30 +0000 (01:09 +0000)]
Merge changes I80504f43,Ifc372eef

* changes:
  Fix package install flow w.r.t. dexopt
  Do not apply app-link autoVerify policy to instant app installs

6 years agoMerge "IMS: Add new APIs for call barring operations" am: c1c29dbf45
Jordan Liu [Fri, 1 Dec 2017 00:48:02 +0000 (00:48 +0000)]
Merge "IMS: Add new APIs for call barring operations" am: c1c29dbf45
am: 1468d0f7e5

Change-Id: I05080f7865a599cb6e41fd9e5a35f4b631880d9f

6 years agoMerge "IMS: Add new APIs for call barring operations"
Jordan Liu [Fri, 1 Dec 2017 00:36:14 +0000 (00:36 +0000)]
Merge "IMS: Add new APIs for call barring operations"
am: c1c29dbf45

Change-Id: Ibb11c26494791baac116fb561c03cbdc371766a1

6 years agoMerge "IMS: Add new APIs for call barring operations"
Jordan Liu [Fri, 1 Dec 2017 00:25:43 +0000 (00:25 +0000)]
Merge "IMS: Add new APIs for call barring operations"

6 years agoQuick fix the getMobileNetworkOperator() in CellIdentity.
Cassie [Thu, 30 Nov 2017 23:54:51 +0000 (15:54 -0800)]
Quick fix the getMobileNetworkOperator() in CellIdentity.

Bug: 69915536
Test: Basic telephony sanity
Change-Id: Iac8222055aea95fbb5334876124ce9d1571ae2f6

6 years agoFix package install flow w.r.t. dexopt
Calin Juravle [Thu, 16 Nov 2017 00:28:01 +0000 (16:28 -0800)]
Fix package install flow w.r.t. dexopt

Calling dexopt before the applicationInfo gets the uid is wrong.
Dexopt needs to be able to set the GID of the odex file to the
UserHandle.getSharedAppGid(pkg.applicationInfo.uid) and that is
possible only with a valid uid.

Move the dexopt logic after installNewPackageLIF/replacePackageLIF
to ensure that we get a valid uid.

Bug: 69331247
Test: adb install & check the GID of the compiler artifacts

(cherry picked from commit c6540daf8388ce1ebd2e4157ec70b9651ae14b4f)

Merged-In: I2434a1a0b9015091a9af2009b3f785b7a16e1256
Change-Id: I80504f434e1507f30f366d1122224ff959bec4a1

6 years agoDo not apply app-link autoVerify policy to instant app installs
Christopher Tate [Thu, 5 Oct 2017 00:38:20 +0000 (17:38 -0700)]
Do not apply app-link autoVerify policy to instant app installs

Bug: 66698768
Test: manual

(cherry picked from commit 05941b396a44bd81c143b727e5c4c630212228e0)

Merged-In: Ib9bea22bf8096e708eef93934e0e972be3a2a4c5
Change-Id: Ifc372eef9bc2a140b9252c85f9be0c2ff9cdbb4c

6 years agoEnsure that debug builds crash again if there is a BinderProxy leak.
Hans Boehm [Fri, 3 Nov 2017 22:56:59 +0000 (15:56 -0700)]
Ensure that debug builds crash again if there is a BinderProxy leak.

This fails when trying to run the AOSP mailer with CRASH_AT_SIZE = 500,
when the check interval is reduced sufficiently so that the test is
actually executed. System server has been observed to use more than
1000 BinderProxies. Thus 5000 seems like roughly the lowest safe limit.

Note that the test is executed somewhat rarely, so we may exceed
this number by quite a few before we actually crash.

Bug: 65760710
Test: Builds, AOSP boots & works for a few tasks. Fails as expected
with reduced limit.

Change-Id: I1c999b85e1ba1bd1d166a9ffba4f0b3992ffee45

6 years agoMerge "Fix warning from clang+mingw" am: 7fce15dc5e
Dan Willemsen [Thu, 30 Nov 2017 23:26:44 +0000 (23:26 +0000)]
Merge "Fix warning from clang+mingw" am: 7fce15dc5e
am: 31bcd7acea

Change-Id: Ibb5c891fe3c219d75be8c124c9be215a31b2a241

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:18:38 +0000 (23:18 +0000)]
Merge "Fix warning from clang+mingw"
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix warning from clang+mingw"

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:49:12 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4f9f278341  -s ours

Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:45:16 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c6f7366fc  -s ours

Change-Id: Ibb384b268ce40bfded2d65dc5153a9a2346b25f6

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:18:13 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 7e3f498034  -s ours

Change-Id: I58269033b0b7197f5da1637a073e20687b021dde

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:11:12 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1536c4ed80  -s ours

Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:06:01 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0b3911b32f  -s ours

Change-Id: I7b12b5dd06b50c636f2511ec0f6e5dd30a631bd1

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:47:29 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c168312e92  -s ours

Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ea754a6814  -s ours

Change-Id: I8a889554572839e12eb0e293d85982b707d4086e

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:38:54 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 23e0aacf9f  -s ours

Change-Id: Iffa9e589502b1b310e8adf7b5005aafe9e39c73d

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: b233aa7360  -s ours

Change-Id: I041d08b9e110ffb4d285139f4550d00f1521cb98

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:24:59 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: fac8c29db6  -s ours

Change-Id: I78bbc45aa215f7620224d4e7cd121131a9b34700

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 21:10:57 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 18fd5109c9  -s ours

Change-Id: I66a71face01ca5e2e3fa1ee720cf85b68af6d6aa

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:05:04 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:02:50 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:02:12 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:01:29 +0000 (21:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:40 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:00 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:57:44 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:56:37 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:53:57 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:52:04 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agocherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
Kevin Hufnagle [Thu, 30 Nov 2017 19:24:10 +0000 (19:24 +0000)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
am: d6ebb55c62

Change-Id: I88bf4c778a04b5f43a7fcd22d4aadb378860bb8a

6 years agoMerge "Add SMS over IMS APIs" am: 74445ed311
Mohamed [Thu, 30 Nov 2017 16:15:58 +0000 (16:15 +0000)]
Merge "Add SMS over IMS APIs" am: 74445ed311
am: 208f232825

Change-Id: If9b5427292eaa41b6381351c57ec5cad4b6bc4a1

6 years agoMerge "Add SMS over IMS APIs"
Mohamed [Thu, 30 Nov 2017 16:05:36 +0000 (16:05 +0000)]
Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913

6 years agoMerge "Add SMS over IMS APIs"
Treehugger Robot [Thu, 30 Nov 2017 15:56:30 +0000 (15:56 +0000)]
Merge "Add SMS over IMS APIs"

6 years agoIMS: Add new APIs for call barring operations
Benergy Meenan Ravuri [Mon, 17 Oct 2016 07:18:29 +0000 (12:48 +0530)]
IMS: Add new APIs for call barring operations

Add below APIs to perform call barring operations for a
specified service class.

queryCallBarringForServiceClass
updateCallBarringForServiceClass

Test: Manual
Bug: 37559543
Change-Id: I438d3527f0e4b2c09de3f7e44e6b80df82b915ae

6 years agoBuild overlaytests as part of the normal build
Paul Duffin [Thu, 30 Nov 2017 12:03:15 +0000 (12:03 +0000)]
Build overlaytests as part of the normal build

Test: make checkbuild
Change-Id: I1ebdbfd309246b24f1f64e3555c6dfdc592b1868

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 10:51:39 +0000 (02:51 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Id4714728cce7cdc505ef573f61b0807eaf99f638

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 08:48:58 +0000 (00:48 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I2ea80486888541821be5a1e2d446097e77344ff7

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 08:43:30 +0000 (00:43 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Iefa1c8df1516425e13eeeb7a4f4636289cc5ed61

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:56:53 +0000 (22:56 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Ie7f618c50bfc451f5204eee4a297556adb196b46

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:49:30 +0000 (22:49 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I5cf5dca14d5e94662e359cec6c67e2009f389bee

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:42:06 +0000 (22:42 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Ided857799b25fe123782edb65ef2b54f1244af5d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:34:30 +0000 (22:34 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I648ee3247fda8398c0ca6d6f4a46a11934966d0f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:07:25 +0000 (22:07 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Ifcf4b8c7138eef6ee513797b51a8d012880b0718

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 06:00:05 +0000 (22:00 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I49111f0ab267e797467bed312cced654e9085552

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 05:52:53 +0000 (21:52 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Ic8b80f7703cab100a2b5eaebb3bf48ea0b5164c6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 05:44:48 +0000 (21:44 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Iaf4029cb66b19628b02847e281b7bba702cbf3f4

6 years agoMerge "Use -Werror in frameworks/base/media/mca/filterfw" am: 171fce8377
Chih-hung Hsieh [Thu, 30 Nov 2017 02:27:13 +0000 (02:27 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw" am: 171fce8377
am: cba4979a6a

Change-Id: Ifea0bcb3e48a83ba21c24026d95819f4f947d039

6 years agoMerge "Use -Werror in frameworks/base/media/mca/filterfw"
Chih-hung Hsieh [Thu, 30 Nov 2017 02:19:13 +0000 (02:19 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"
am: 171fce8377

Change-Id: I698ee4b4d6c884469253238795d23bdb21a54542

6 years agoFix warning from clang+mingw
Dan Willemsen [Thu, 30 Nov 2017 02:17:08 +0000 (18:17 -0800)]
Fix warning from clang+mingw

I suspect this is showing up in this configuration because we're now building
with -std=gnu++14, but still using libstdc++.

frameworks/base/tools/aapt2/link/ProductFilter_test.cpp:76:24: error: chosen constructor is explicit in copy-initialization
  ProductFilter filter({});
                       ^~
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include/c++/4.8.3/bits/unordered_set.h:132:7: note: explicit constructor declared here
      unordered_set(size_type __n = 10,
      ^
frameworks/base/tools/aapt2/link/Linkers.h:114:58: note: passing argument to parameter 'products' here
  explicit ProductFilter(std::unordered_set<std::string> products) : products_(products) {
                                                         ^

Bug: 69933068
Test: mmma frameworks/base/tools/aapt2
Test: out/host/linux-x86/nativetest[64]/aapt2_tests/aapt2_tests
Change-Id: I2133e364dd11f64fd13239125f8a3eff70ebb69c

6 years agoMerge "Use -Werror in frameworks/base/media/mca/filterfw"
Chih-hung Hsieh [Thu, 30 Nov 2017 01:55:47 +0000 (01:55 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"

6 years agoAdd SMS over IMS APIs
Mohamed [Tue, 28 Nov 2017 02:40:09 +0000 (18:40 -0800)]
Add SMS over IMS APIs

- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.

Moving over from  ag/3265442

Bug: 69846044

Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a

6 years agoMerge "fixed CdmaSmsAddress parser" am: b00f00e74b
Pengquan Meng [Thu, 30 Nov 2017 00:10:02 +0000 (00:10 +0000)]
Merge "fixed CdmaSmsAddress parser" am: b00f00e74b
am: c8ec8a5e56

Change-Id: Id3830aaea1037b61ecc385715708427c84030206

6 years agoMerge "fixed CdmaSmsAddress parser"
Pengquan Meng [Wed, 29 Nov 2017 23:52:41 +0000 (23:52 +0000)]
Merge "fixed CdmaSmsAddress parser"
am: b00f00e74b

Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936

6 years agoMerge "fixed CdmaSmsAddress parser"
Pengquan Meng [Wed, 29 Nov 2017 23:38:29 +0000 (23:38 +0000)]
Merge "fixed CdmaSmsAddress parser"

6 years agoUse -Werror in frameworks/base/media/mca/filterfw
Chih-Hung Hsieh [Wed, 29 Nov 2017 22:43:12 +0000 (14:43 -0800)]
Use -Werror in frameworks/base/media/mca/filterfw

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I12137a0b40357954af63bac3771332773b03da9a

6 years agocherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
Kevin Hufnagle [Tue, 16 May 2017 23:48:10 +0000 (16:48 -0700)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java

Added note within getSerial() in android.os.Build class. Device
identifiers, such as hardware serial numbers, can be modified if a
device is rooted. Others can use key attestation to discover these
changes. Added a note to this effect within this method.

Test: make ds-docs -j8

Bug: 38312326
Change-Id: I76e3f6a15b9a8673ca3304218653e8cd26da38d7
Original-Change-Id: Ibd2dab621c14683e12a213957b567ee49b8d00fd

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers" am: 8a95711ef1
Andre Eisenbach [Wed, 29 Nov 2017 21:36:44 +0000 (21:36 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers" am: 8a95711ef1
am: f51d382d9c

Change-Id: I698fd46b7784a9093ccfc23e6c1de020f2ac1d3b

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers"
Andre Eisenbach [Wed, 29 Nov 2017 21:24:50 +0000 (21:24 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"
am: 8a95711ef1

Change-Id: I0dbe07aac6e6a8ea1b6858548bd26fffd7e21dd3

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers"
Treehugger Robot [Wed, 29 Nov 2017 21:09:40 +0000 (21:09 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"

6 years agoMerge "Fix issue with PiP callbacks not being handled" am: bdd8adb006
Winson Chung [Wed, 29 Nov 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006
am: 4e11a71210

Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3

6 years agoMerge "Fix issue with PiP callbacks not being handled"
Winson Chung [Wed, 29 Nov 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Fix issue with PiP callbacks not being handled"
am: bdd8adb006

Change-Id: I03c0ef06309b1b7559a973e2823598031de3b182

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d
Hemant Gupta [Wed, 29 Nov 2017 20:29:53 +0000 (20:29 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d
am: cca3c9bb01

Change-Id: Ia9edce62a31b5344b5627bf0d141d72d40d6e37c

6 years agoMerge "Fix issue with PiP callbacks not being handled"
Winson Chung [Wed, 29 Nov 2017 20:18:45 +0000 (20:18 +0000)]
Merge "Fix issue with PiP callbacks not being handled"

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
Hemant Gupta [Wed, 29 Nov 2017 20:17:31 +0000 (20:17 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
am: edfb333a4d

Change-Id: I28de2826209a16b763d64a1b31381f748067789c

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
Treehugger Robot [Wed, 29 Nov 2017 20:03:12 +0000 (20:03 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl" am: 572f46a3ef
Andreas Gampe [Wed, 29 Nov 2017 19:38:11 +0000 (19:38 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl" am: 572f46a3ef
am: 70da38960c

Change-Id: Ia4c24c8cd6fbeb58a90d56319558fc3c78474c2b

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl"
Andreas Gampe [Wed, 29 Nov 2017 19:25:13 +0000 (19:25 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"
am: 572f46a3ef

Change-Id: I7b922f795283cefabf661e999e5a9897889fa287

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl"
Treehugger Robot [Wed, 29 Nov 2017 19:11:46 +0000 (19:11 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"

6 years agoBluetooth: Pre-pend empty line for dumpsys section headers
Andre Eisenbach [Mon, 10 Apr 2017 20:49:13 +0000 (13:49 -0700)]
Bluetooth: Pre-pend empty line for dumpsys section headers

Test: manual
Change-Id: I2daa5c985e5504606edd9ff558bd5b92af7a7240

6 years agoOBEX: Avoid pre-sending CONTINUE for SRM enabled case
Hemant Gupta [Fri, 28 Aug 2015 09:43:47 +0000 (15:13 +0530)]
OBEX: Avoid pre-sending CONTINUE for SRM enabled case

Remote Device: LG-G2 as OPP client

Use Case:
1) Pair DUT with Remote.
2) Now push the file from Remote.
3) Ignore the incoming request from Remote

Failure:
RX_Notification lasts only for 10 seconds.

Fix:
OBEX lib handles a PUT Request case with NO BODY header on server
session with CONTINUE  response until body is found in request
packet from remote. However, this needs to be avoided if SRM is
enabled from remote to get proceed transfer authorization
from Application layer.

Test: Send connection request from remote device and verified that
connection is sustainable for 30 seconds until timeout.

Bug: 37886388
Change-Id: I1b5bfd65f9023d77850a34bcb08cfbb435e9a474

6 years agofixed CdmaSmsAddress parser
Pengquan Meng [Thu, 2 Nov 2017 23:56:09 +0000 (16:56 -0700)]
fixed CdmaSmsAddress parser

The digit mode of CdmaSmsAddress is incorrect for international
address.

See 3GPP2 C.S0015-B section 3.4.3.3 Address Parameters for the spec of
CdmaSmsAddress.

Also see the table from 3GPP2 C.S005-D, table2.7.1.3.2.4-2.

Bug: 34805351
Test: unit test
Change-Id: I542a717986009b01d19aef5e61964f03b216a162

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button" am...
Jordan Liu [Tue, 28 Nov 2017 22:11:38 +0000 (22:11 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button" am: dc98d6e44b
am: 7a42c3614e

Change-Id: I0bb715785a7ea0286936b1213c5057497b8856de

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button"
Jordan Liu [Tue, 28 Nov 2017 22:00:50 +0000 (22:00 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button"
am: dc98d6e44b

Change-Id: I474338d3475706f856e63fc8c558850c3afd0bb3

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button"
Jordan Liu [Tue, 28 Nov 2017 21:40:01 +0000 (21:40 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button"

6 years agoAdd carrier config variable to hide manage IMS conference call button
Wei Huang [Fri, 22 Apr 2016 06:33:55 +0000 (14:33 +0800)]
Add carrier config variable to hide manage IMS conference call button

Add carrier config to determine whether manage IMS conference calls
is supported by a carrier.

Test: not tested since a new config is just added
Bug: 28729600
Change-Id: I1000830a85814150658b62ea9add72bfb83bbba0
Merged-In: I1000830a85814150658b62ea9add72bfb83bbba0

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API" am: 24cd7cbd1e
Jack Yu [Tue, 28 Nov 2017 17:53:48 +0000 (17:53 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API" am: 24cd7cbd1e
am: 3221d23138

Change-Id: I3b1e2d475721de9388de5cb4acb52a003cc16e62

6 years agoMerge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f
Jakub Pawlowski [Tue, 28 Nov 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f
am: 0f9b8c2c60

Change-Id: I971ab43aed9d0f656e0878e7277ec8e416b1867f

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API"
Jack Yu [Tue, 28 Nov 2017 17:39:01 +0000 (17:39 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 24cd7cbd1e

Change-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337

6 years agoMerge "Add persistent state for Hearing Aid Profile"
Jakub Pawlowski [Tue, 28 Nov 2017 17:32:19 +0000 (17:32 +0000)]
Merge "Add persistent state for Hearing Aid Profile"
am: 2282e2f57f

Change-Id: Iff05733aeb2214b1720883f6c7c28a3357887ec2

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API"
Jack Yu [Tue, 28 Nov 2017 17:21:40 +0000 (17:21 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API"

6 years agoMerge "Add persistent state for Hearing Aid Profile"
Jakub Pawlowski [Tue, 28 Nov 2017 17:21:10 +0000 (17:21 +0000)]
Merge "Add persistent state for Hearing Aid Profile"

6 years agoAdd persistent state for Hearing Aid Profile
Jakub Pawlowski [Wed, 22 Nov 2017 18:57:42 +0000 (10:57 -0800)]
Add persistent state for Hearing Aid Profile

Defines the flag used in code and the Settings.Global key names for
persisting state of the Bluetooth Hearing Aid Profile.

Test: manual
Bug: 69623109
Change-Id: I19e68be55a80f338bdc5d39d6c3c6d251f1cb514
Merged-In: I19e68be55a80f338bdc5d39d6c3c6d251f1cb514

6 years agoMerge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
Dianne Hackborn [Tue, 28 Nov 2017 00:50:13 +0000 (00:50 +0000)]
Merge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
am: b94e697dcf

Change-Id: I40ef78ee243cbb2f5967115e40740a3f36b253ef

6 years agoMerge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
TreeHugger Robot [Tue, 28 Nov 2017 00:28:07 +0000 (00:28 +0000)]
Merge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev

6 years agoMoved DataProfile from telephony internal hidden API to System API
Jack Yu [Mon, 20 Nov 2017 19:14:23 +0000 (11:14 -0800)]
Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
(cherry picked from commit fc84bb5f5c6e30db0eca589eb67b406bf4bfadbe)