Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
323,245 Commits 3 Branches 0 Tags
99f010ea3cf086fb82499e6bc0a6946f34df877b
Commit Graph

323245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chen Xu
99f010ea3c Merge "Handle invalid destination address gracefully" am: a753dfd2e8 
am: 825345628c

Change-Id: I68f8125a3f69bd5bd13e5ef1615e58ae55ad7d77
 2017-08-09 07:40:11 +00:00
Jordan Liu
66ad753bd8 Merge "Fix error message strings" am: 67862237e9 
am: ab1d052155

Change-Id: Ia69f3161e4a00306f85a622f0a9aae3c6e12faf2
 2017-08-09 07:37:43 +00:00
Hampus Wessman
1ab5ad358c Merge "Fix graphical artifact in the fisheye effect" am: 0b885b8096 
am: f22a6f7c60

Change-Id: Ic87ce113e789a1e1e1719b4c57d87dd66bcd6d61
 2017-08-09 07:35:47 +00:00
Jack Yu
562c2febe0 Merge "Moved channels settings from carrier config to resources" am: 79eddf8c0a 
am: 54ccaa0e99

Change-Id: I44d1e2602867049c9e82911a5b4066e6f0c88d7f
 2017-08-09 07:29:23 +00:00
Jakub Pawlowski
4eba68c81f Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" am: 15658662fd -s ours 
am: 2bcb9ec481

Change-Id: Ifaf5a9477a51a5f252a1cdc68d977a865ccc6fd5
 2017-08-09 07:25:20 +00:00
Chen Xu
825345628c Merge "Handle invalid destination address gracefully" 
am: a753dfd2e8

Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
 2017-08-09 07:24:05 +00:00
Jordan Liu
ab1d052155 Merge "Fix error message strings" 
am: 67862237e9

Change-Id: I5dc11be348893ed61b1aee8777059967ac7b910e
 2017-08-09 07:21:22 +00:00
Hampus Wessman
f22a6f7c60 Merge "Fix graphical artifact in the fisheye effect" 
am: 0b885b8096

Change-Id: I07a41a6a7e7cb7f145b3624bf58e4addeeb24547
 2017-08-09 07:19:11 +00:00
Jack Yu
54ccaa0e99 Merge "Moved channels settings from carrier config to resources" 
am: 79eddf8c0a

Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
 2017-08-09 07:16:37 +00:00
Jakub Pawlowski
2bcb9ec481 Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" 
am: 15658662fd  -s ours

Change-Id: I3af0324d3a2029b5b4c27625c1c0b6f74363fc59
 2017-08-09 07:13:32 +00:00
Chen Xu
a753dfd2e8 Merge "Handle invalid destination address gracefully" 2017-08-09 01:09:42 +00:00
Jordan Liu
67862237e9 Merge "Fix error message strings" 2017-08-09 00:41:57 +00:00
Treehugger Robot
0b885b8096 Merge "Fix graphical artifact in the fisheye effect" 2017-08-09 00:00:43 +00:00
Treehugger Robot
79eddf8c0a Merge "Moved channels settings from carrier config to resources" 2017-08-08 23:56:05 +00:00
fionaxu
b50183d2fd Handle invalid destination address gracefully 
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
 2017-08-08 16:41:23 -07:00
Jordan Liu
1185dc50f8 Fix error message strings 
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.

Fixes: 64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
 2017-08-08 16:06:17 -07:00
Jakub Pawlowski
15658662fd Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" 2017-08-08 22:39:31 +00:00
Jack Yu
0fc9492176 Moved channels settings from carrier config to resources 
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.

Test: Manual
bug: 31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
 2017-08-08 15:34:28 -07:00
Jakub Pawlowski
6732625aa0 Bluetooth: move AIDL files related to bluetooth into system/bt (1/2) 
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.

Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit 06ae9c665b)
 2017-08-08 12:38:37 -07:00
Takashi Furukawa
a6e588fffc Merge "Add null check for Wi-Fi command" am: 43ee2ac140 
am: 51e24de109

Change-Id: I9c79eadbf827f9f8cb17c69e704c25e5225c2bc5
 2017-08-08 18:20:59 +00:00
Takashi Furukawa
51e24de109 Merge "Add null check for Wi-Fi command" 
am: 43ee2ac140

Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5
 2017-08-08 18:14:53 +00:00
Treehugger Robot
43ee2ac140 Merge "Add null check for Wi-Fi command" 2017-08-08 18:03:14 +00:00
Felipe Leme
04a8660851 Clarifies autofill lifecycle. 
am: 744976e298

Change-Id: I201294893d541718aadac7daffa064c1f1244c1a
 2017-08-08 17:37:13 +00:00
Calin Juravle
4740e015b9 Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d 
am: 8a9e43f1bf

Change-Id: I6d7770a61fdeb3962342e6b46a9af67126b623ba
 2017-08-08 17:21:10 +00:00
Calin Juravle
8a9e43f1bf Merge "Update DexLoadReporter to comply with the new reporting API" 
am: 89d087886d

Change-Id: If94d3ecb40eef29acb0ab6709de23b37a722119b
 2017-08-08 17:13:06 +00:00
Calin Juravle
89d087886d Merge "Update DexLoadReporter to comply with the new reporting API" 2017-08-08 17:03:21 +00:00
Hugo Benichi
082a9fa173 Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc114f -s ours 
am: 607f74b317  -s ours

Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c
 2017-08-08 08:48:56 +00:00
Hugo Benichi
607f74b317 Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" 
am: c06dbc114f  -s ours

Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
 2017-08-08 08:40:40 +00:00
Treehugger Robot
c06dbc114f Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" 2017-08-08 08:30:03 +00:00
Hugo Benichi
db554dfdfa Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b 
am: a22fbf4534

Change-Id: I64895a50baca163588ce863f7fb93fad31d7f55b
 2017-08-08 07:40:02 +00:00
Hugo Benichi
ffcc739a39 Merge "Fix flaky IpPrefixTest." am: 2cbce2cb27 -s ours 
am: 7d752a872d  -s ours

Change-Id: I216b50a8d0f51f2f731b17598b205a7b0ad65324
 2017-08-08 07:34:42 +00:00
Hugo Benichi
a22fbf4534 Merge "Connectivity OWNERS: let owners modify Android.mk" 
am: 05be68698b

Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
 2017-08-08 07:34:39 +00:00
Hugo Benichi
7d752a872d Merge "Fix flaky IpPrefixTest." 
am: 2cbce2cb27  -s ours

Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
 2017-08-08 07:28:32 +00:00
Hugo Benichi
847647b96b Merge "Add OWNERS to com.android.server.net" am: 0a00151bd1 
am: 24f5d8f866

Change-Id: Id6986ccea642c2e78e6b7493cec553a9fe53971f
 2017-08-08 07:21:41 +00:00
Hugo Benichi
05be68698b Merge "Connectivity OWNERS: let owners modify Android.mk" 2017-08-08 07:20:07 +00:00
Treehugger Robot
2cbce2cb27 Merge "Fix flaky IpPrefixTest." 2017-08-08 07:16:48 +00:00
Hugo Benichi
24f5d8f866 Merge "Add OWNERS to com.android.server.net" 
am: 0a00151bd1

Change-Id: Ib9938dd15a173d459ca67e5dc19430da57c29115
 2017-08-08 07:16:12 +00:00
Treehugger Robot
0a00151bd1 Merge "Add OWNERS to com.android.server.net" 2017-08-08 07:07:25 +00:00
Hugo Benichi
4478840931 DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies 
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.

Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708

(cherry pick from commit 99e8ab6e46)

Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
 2017-08-08 16:06:54 +09:00
Hugo Benichi
e4d461c0c8 Add OWNERS to com.android.server.net 
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
 2017-08-08 16:06:53 +09:00
Hugo Benichi
41494c10e6 Fix flaky IpPrefixTest. 
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645

(cherry pick from commit 32c6870403)

Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
 2017-08-08 14:54:08 +09:00
Hugo Benichi
afd2346bcc Connectivity OWNERS: let owners modify Android.mk 
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.

This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.

Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
 2017-08-08 10:46:57 +09:00
Felipe Leme
744976e298 Clarifies autofill lifecycle. 
Test: m update-api

Bug: 64125551
Bug: 64114048
Change-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e
 2017-08-07 17:22:50 -07:00
Colin Cross
a5538805d9 Merge "Use class retention for VisibleForTesting annotations" am: 5724841581 
am: 94d5456d0e

Change-Id: I3309ee0b936eb9d36a453beb084be31e046c1bf5
 2017-08-07 19:44:57 +00:00
Colin Cross
94d5456d0e Merge "Use class retention for VisibleForTesting annotations" 
am: 5724841581

Change-Id: Iaa9262ad627b49d58b46760d7aecd3a985c3a79a
 2017-08-07 19:32:21 +00:00
Treehugger Robot
5724841581 Merge "Use class retention for VisibleForTesting annotations" 2017-08-07 19:17:33 +00:00
Colin Cross
5be3cbad27 Use class retention for VisibleForTesting annotations 
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests.  The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation.  When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.

Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.

Bug: 64365384
Test: m -j MtpDocumentsProvider &&
      javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot

Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit 8e846143dd)
 2017-08-07 11:07:15 -07:00
Bill Yi
9faa483116 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 4e9a4d81d2  -s ours

Change-Id: I44afdc21e739a394b1be87917151b7c4fa5d0e52
 2017-08-07 05:33:46 +00:00
Bill Yi
5c0301ef95 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: c733eac940  -s ours

Change-Id: Ieef28579af4ac0f7fb3431c8cc72416c3bf40484
 2017-08-07 05:31:31 +00:00
Bill Yi
2c97d049c2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 06a47f450a  -s ours

Change-Id: I85fd4ac952d4958fa92b2bf0cda260ad5b5fbae1
 2017-08-07 05:29:40 +00:00