OSDN Git Service
nharold [Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)]
Merge "Fix broken test due to API rename" am:
0abc93177f
am:
ee898c81a7
Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
nharold [Thu, 14 Dec 2017 23:20:11 +0000 (23:20 +0000)]
Merge "Fix broken test due to API rename"
am:
0abc93177f
Change-Id: I75a3f96e0d6d7cf05bbd8eb0dae03d114ac76f3e
nharold [Thu, 14 Dec 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Fix broken test due to API rename"
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.
Bug:
69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:46:29 +0000 (22:46 +0000)]
Merge "Confirmation code second try." am:
df0f5e9791
am:
cdc3c3ec77
Change-Id: I4c0de71e0c488551f6d0fa5e1f73ca2971e4a5f6
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Confirmation code second try."
am:
df0f5e9791
Change-Id: I426c5fcb2610cd1740fb9d6cd0a98a7bacfcb58a
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:25:37 +0000 (22:25 +0000)]
Merge "Confirmation code second try."
nharold [Thu, 14 Dec 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use consistent naming for allocating SPI." am:
bf48afea49
am:
4753ed4b1b
Change-Id: Ib5d89044313341790b1ee9271642072ddce181af
nharold [Thu, 14 Dec 2017 21:21:06 +0000 (21:21 +0000)]
Merge "Use consistent naming for allocating SPI."
am:
bf48afea49
Change-Id: I9adb5c14e91b33f09707c85c865cf2fc454f80ba
nharold [Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Use consistent naming for allocating SPI."
Mathieu Chartier [Thu, 14 Dec 2017 19:57:14 +0000 (19:57 +0000)]
Merge "Remove compiled classes list" am:
3adfec2de3
am:
3a3fc7a43b
Change-Id: Ia40246372d156d308c4e3930c3789dfe0a1010f8
Mathieu Chartier [Thu, 14 Dec 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Remove compiled classes list"
am:
3adfec2de3
Change-Id: I98d29b9f3aeeaf78ba93b631b0746cc37ac9e7e5
Treehugger Robot [Thu, 14 Dec 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Remove compiled classes list"
Jeff Davidson [Thu, 14 Dec 2017 18:26:04 +0000 (18:26 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am:
6e41b2c5c8
am:
67c9a43605
Change-Id: If333cd7cee4785779cdd4acc8421059c4a947dd2
Jeff Davidson [Thu, 14 Dec 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
am:
6e41b2c5c8
Change-Id: I9fd9ab01b770fc8a1c5998d3a4c3e824123e2076
Treehugger Robot [Thu, 14 Dec 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
Mathieu Chartier [Tue, 12 Dec 2017 19:17:01 +0000 (11:17 -0800)]
Remove compiled classes list
No longer used.
(cherry-picked from commit
c87f8124bc1b79969f512f67d5d7f837b4cf28f7)
Bug:
37966211
Test: make
Merged-In: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Change-Id: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
gaoshang [Thu, 14 Dec 2017 16:37:08 +0000 (16:37 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am:
11ec2eb118
am:
4f697fe574
Change-Id: Ice43c79858930ccc48b9470152e0af2d99e966ae
Jeff Davidson [Fri, 10 Nov 2017 23:58:20 +0000 (15:58 -0800)]
Update PhoneStateListener#onCallStateChanged Javadoc.
While the doc suggested that the phone number was "incoming" (e.g.
only populated for incoming calls), it should also be populated for
outgoing calls.
Bug:
67748129
Test: Verified expected behavior on Taimen running OC-MR1, added CTS
test (see other CL in this topic)
Change-Id: I1ddd9c042f287953358a794b91b2af5ed6f5b597
Merged-In: I1ddd9c042f287953358a794b91b2af5ed6f5b597
gaoshang [Thu, 14 Dec 2017 16:26:46 +0000 (16:26 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
am:
11ec2eb118
Change-Id: I7e527a58332a4453fe104538e55a60a444602159
Treehugger Robot [Thu, 14 Dec 2017 16:14:34 +0000 (16:14 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
gaoshang [Thu, 14 Dec 2017 09:52:23 +0000 (17:52 +0800)]
input cmds: fix keyevent not support sources parameter
reused args.length repalce length.
https://issuetracker.google.com/issues/
70654695
Test: input cmds
Change-Id: Ifd8600d66d1647ae677add6b9d95b1d6831d6edb
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Holly Jiuyu Sun [Fri, 10 Nov 2017 03:28:49 +0000 (19:28 -0800)]
Confirmation code second try.
Bug:
69050703
Test: test on phone
Merged-In: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
Change-Id: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
Hugo Benichi [Thu, 14 Dec 2017 03:25:36 +0000 (03:25 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056
am:
3304263594
Change-Id: I816a15beedcfc9f200d00da7282e54992a096555
Hugo Benichi [Thu, 14 Dec 2017 03:15:04 +0000 (03:15 +0000)]
Merge "Extend connectivity OWNERS"
am:
64c2488056
Change-Id: I07622a82cac394a52f5e17a9f33e6bbbe68b61ea
Treehugger Robot [Thu, 14 Dec 2017 02:56:40 +0000 (02:56 +0000)]
Merge "Extend connectivity OWNERS"
Benedict Wong [Thu, 14 Dec 2017 02:20:20 +0000 (02:20 +0000)]
Merge "Convert IpSecService resources to use refcounting" am:
b6ba8fd49d
am:
8698b33cc2
Change-Id: I9645df5304d7f11068d190cbdaccfe83ca0580bc
Felipe Leme [Thu, 14 Dec 2017 02:12:06 +0000 (02:12 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1 am:
4a8d9b628f -s ours
am:
f4c26d98a6 -s ours
Change-Id: I568f64d403ef03dfec91b99dd4e0e224631b38b7
Benedict Wong [Thu, 14 Dec 2017 02:00:41 +0000 (02:00 +0000)]
Merge "Convert IpSecService resources to use refcounting"
am:
b6ba8fd49d
Change-Id: I88a67008ea88f40aff918422c085fa9add3aeba3
Felipe Leme [Thu, 14 Dec 2017 02:00:35 +0000 (02:00 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1
am:
4a8d9b628f -s ours
Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
Benedict Wong [Thu, 14 Dec 2017 01:45:15 +0000 (01:45 +0000)]
Merge "Convert IpSecService resources to use refcounting"
Felipe Leme [Thu, 14 Dec 2017 01:43:23 +0000 (01:43 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
am:
f2eddf8df9
Change-Id: I7603e96214ca4e97985b6678cb0e75b7e36d0880
TreeHugger Robot [Thu, 14 Dec 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
Hugo Benichi [Sat, 9 Dec 2017 03:57:41 +0000 (12:57 +0900)]
Extend connectivity OWNERS
Also remove 'build.master@android.com' which is deprecated, not
declared by anybody else, and makes the linter unhappy.
Bug:
70394432
Test: built
Merged-In: I9c0ba41386129379f82259fcc5e745562b014fae
(cherry pick from commit
626eed2ac826a34b3ac9b1d4ddb9a783222187ec)
Change-Id: Ie802113d61f693d73f7234b44ac2a9bd462b3fbf
Benedict Wong [Thu, 16 Nov 2017 23:27:22 +0000 (15:27 -0800)]
Convert IpSecService resources to use refcounting
This is part 2 of 2 of the refcounting refactor for IpSecService
resources.
Switched ManagedResources to use RefcountedResource structure for
managing reference counts and eventual cleanup. Further, resource arrays
and quota management have been aggregated into a UserRecord for better
isolation. UID access checking has been similarly moved into the
UserRecordTracker, and resourceId checking has been rolled into
RefcountedResourceArray's accessor methods.
Bug:
63409385
Test: CTS, all unit tests run on aosp_marlin-eng, new tests added
Change-Id: Iee52dd1c9d2583bb6bfaf65be87569e9d50a5b63
Ta-wei Yen [Wed, 13 Dec 2017 22:17:45 +0000 (22:17 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e
am:
a02bbdb8d8
Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca
Ta-wei Yen [Wed, 13 Dec 2017 22:07:17 +0000 (22:07 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
am:
8244ebfc4e
Change-Id: Iea3c38056e17abc09af7f7d933cbb9627575d8ee
Benedict Wong [Wed, 13 Dec 2017 22:00:26 +0000 (22:00 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a
am:
adb6437fea
Change-Id: I927ac534570b3836510e0fb4feda8cf544f5a9e4
Treehugger Robot [Wed, 13 Dec 2017 21:56:12 +0000 (21:56 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
Benedict Wong [Wed, 13 Dec 2017 21:50:19 +0000 (21:50 +0000)]
Merge "Add reference counted resources to IpSecService"
am:
e11366f38a
Change-Id: If218f4c241199e22e3295a5bcb049980d7949f4e
Benedict Wong [Wed, 13 Dec 2017 21:33:38 +0000 (21:33 +0000)]
Merge "Add reference counted resources to IpSecService"
Colin Cross [Wed, 13 Dec 2017 20:43:20 +0000 (20:43 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c
am:
93de069ec9
Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
Colin Cross [Wed, 13 Dec 2017 20:33:28 +0000 (20:33 +0000)]
Merge "Make services.core the final priorityboosted jar"
am:
a0c1780d3c
Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602
Colin Cross [Wed, 13 Dec 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Make services.core the final priorityboosted jar"
Dan Albert [Wed, 13 Dec 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Include what we use." am:
b0efcc1f68
am:
afa15b0846
Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
Dan Albert [Wed, 13 Dec 2017 19:52:11 +0000 (19:52 +0000)]
Merge "Include what we use."
am:
b0efcc1f68
Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
Dmitry Shmidt [Wed, 13 Dec 2017 18:16:43 +0000 (18:16 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217
am:
c1ad3c5f29
Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
Dmitry Shmidt [Wed, 13 Dec 2017 18:04:19 +0000 (18:04 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
am:
50666fa217
Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
Dmitry Shmidt [Wed, 13 Dec 2017 17:51:47 +0000 (17:51 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
Rob Herring [Wed, 29 Nov 2017 15:26:31 +0000 (09:26 -0600)]
renderthread: relax error handling for wide gamut EGL configs
It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.
Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Jack Yu [Wed, 13 Dec 2017 09:51:27 +0000 (09:51 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am:
125d736bbe
am:
06bf4f618c
Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2
Jack Yu [Wed, 13 Dec 2017 09:42:49 +0000 (09:42 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
am:
125d736bbe
Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f
Treehugger Robot [Wed, 13 Dec 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
Jack Yu [Thu, 7 Dec 2017 23:49:09 +0000 (15:49 -0800)]
Added test cases for DataCallResponse parcel read/write
bug:
64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit
14c2aaa0a276807bdf922a3e7ce64bae880e0c68)
Benedict Wong [Fri, 27 Oct 2017 02:41:43 +0000 (19:41 -0700)]
Add reference counted resources to IpSecService
This patch adds (but does not enable the usage of) RefcountedResource
objects to IpSecService, with tests to ensure correct function. This is
patch 1 of a series of patches to refactor the resource management
systems in IpSecService.
RefcountedResource objects allow for management of acyclical dependency
trees, ensuring eventual cleanup when resources are no longer used. This
cleanup may be triggered by binder death or by explicit user action.
Bug:
63409385
Test: New tests written in IpSecServiceRefcountedResourceTest,
explicitly testing the RefcountedResource class
Change-Id: Ib5be7482b2ef5f1c8dec9be68f15e90d8b3aba6d
Colin Cross [Wed, 13 Dec 2017 03:43:04 +0000 (19:43 -0800)]
Make services.core the final priorityboosted jar
Other module besides services depend on services.core, and after
I417409281c928ea667d937090d2a0d9d72a449a2 they were getting
the non-priorityboosted version of the jar. Make services.core
a java_library that contains the output of the priorityboosting
java_genrule.
Test: m services
Change-Id: Ic9ca1b8f43f87b0d7d36b53bbc5136a331490c3e
Eric Erfanian [Wed, 13 Dec 2017 02:21:36 +0000 (02:21 +0000)]
Merge "Add assisted dialing properties to the framework." am:
f5bec0d781
am:
1d9fc9a490
Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27
Hemant Gupta [Wed, 13 Dec 2017 01:56:18 +0000 (01:56 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
045d34ce76
am:
cbfae42c3c
Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61
Colin Cross [Wed, 13 Dec 2017 01:51:09 +0000 (01:51 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:
9a3132d065
am:
4b7a6339cf
Change-Id: Ie2e2704b0de42b4eef032ad6bdca0f0e114bdd3e
Eric Erfanian [Wed, 13 Dec 2017 01:46:02 +0000 (01:46 +0000)]
Merge "Add assisted dialing properties to the framework."
am:
f5bec0d781
Change-Id: Ic4c118892b964e51136fb730070f2a6b6167b212
Colin Cross [Wed, 13 Dec 2017 01:43:52 +0000 (01:43 +0000)]
Merge "Remove unused target android.test.mock.sdk" am:
a4c0fa769a
am:
9d78e84a8e
Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd
Hemant Gupta [Wed, 13 Dec 2017 01:26:35 +0000 (01:26 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am:
045d34ce76
Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2
Colin Cross [Wed, 13 Dec 2017 01:20:42 +0000 (01:20 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
am:
9a3132d065
Change-Id: I6a71d49ae1cc7f3cd5b65c523e3e64b3a882e4da
Colin Cross [Wed, 13 Dec 2017 01:18:14 +0000 (01:18 +0000)]
Merge "Separate android.test.mock from test-runner source" am:
d330eeeeda
am:
78160c2577
Change-Id: Ibaad59f9c605f1c9ae02a4b63f7c01e6b508f55d
Colin Cross [Wed, 13 Dec 2017 01:11:46 +0000 (01:11 +0000)]
Merge "Remove unused target android.test.mock.sdk"
am:
a4c0fa769a
Change-Id: I4ff49776db15ff17449ac615cefd3d2c5e3d2465
Colin Cross [Wed, 13 Dec 2017 01:08:56 +0000 (01:08 +0000)]
Merge "Convert services to Android.bp" am:
5319777274
am:
b8500d4771
Change-Id: Idcfeb088fa73e679d18de2ce2dc2ba58cdc78af7
Colin Cross [Wed, 13 Dec 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Separate android.test.mock from test-runner source"
am:
d330eeeeda
Change-Id: I7d578d55332942f8e3cdc7b44dc10b31cafc4174
Jack He [Wed, 13 Dec 2017 00:45:58 +0000 (00:45 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string" am:
f7a69aeeab
am:
c57c5a9ba4
Change-Id: Id9b238bb2493455650351d595e4c7d2dd5005f2e
Treehugger Robot [Wed, 13 Dec 2017 00:38:42 +0000 (00:38 +0000)]
Merge "Add assisted dialing properties to the framework."
Colin Cross [Wed, 13 Dec 2017 00:38:41 +0000 (00:38 +0000)]
Merge "Convert services to Android.bp"
am:
5319777274
Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Dan Albert [Wed, 13 Dec 2017 00:08:11 +0000 (16:08 -0800)]
Include what we use.
Test: mma
Bug: None
Change-Id: I9458aedad9a84f1660d3a2b08717b111dc8e3b74
Exempt-From-Owner-Approval: trivial cleanup
Jack He [Wed, 13 Dec 2017 00:02:25 +0000 (00:02 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
am:
f7a69aeeab
Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8
Adam Lesinski [Tue, 12 Dec 2017 23:36:57 +0000 (23:36 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
am:
a06854e77a
Change-Id: I9d4f214b3911fb66fd2baa8ad83e8450246c3c80
Colin Cross [Tue, 12 Dec 2017 23:27:15 +0000 (23:27 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Colin Cross [Tue, 12 Dec 2017 23:26:41 +0000 (23:26 +0000)]
Merge "Remove unused target android.test.mock.sdk"
Colin Cross [Tue, 12 Dec 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Separate android.test.mock from test-runner source"
Colin Cross [Tue, 12 Dec 2017 23:25:09 +0000 (23:25 +0000)]
Merge "Convert services to Android.bp"
Colin Cross [Thu, 7 Dec 2017 21:11:06 +0000 (13:11 -0800)]
Convert legacy-test, test-runner, and test-mock to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit
2b7d71c7f8028741c2200bfeba8913b7f4f55cde)
Paul Duffin [Thu, 16 Nov 2017 13:02:37 +0000 (13:02 +0000)]
Remove unused target android.test.mock.sdk
Bug:
30188076
Test: make checkbuild
Change-Id: I9b613969425e6c4d8700f6275484d6452a3cc3af
Merged-In: I9b613969425e6c4d8700f6275484d6452a3cc3af
(cherry picked from commit
10d0658bf020197c16264a1da4637e0d20ee6445)
Paul Duffin [Wed, 15 Nov 2017 11:39:14 +0000 (11:39 +0000)]
Separate android.test.mock from test-runner source
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.
Bug:
30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit
e254526f0fe5d22681555bd4a00b7ee96fee1dc1)
Colin Cross [Tue, 5 Dec 2017 17:46:29 +0000 (09:46 -0800)]
Convert services to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit
e0b2ee52d2f274a2d46b2e6695e42d2764c39fa7)
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
Jonathan Basseri [Thu, 16 Nov 2017 18:58:01 +0000 (10:58 -0800)]
Use consistent naming for allocating SPI.
Throughout the IPsec code (API, system server, netd) we use "reserve"
SPI and "allocate" SPI interchangeably. This renames to use "allocate"
everywhere for self-consistency and consistency with the kernel
(ALLOCSPI).
In javadoc, I am leaving the word "reserve" in several places because it
is still an accurate description of how the method behaves.
Bug:
69128142
Test: TreeHugger should be enough
Change-Id: I8ea603b4612303b0393beef04032671fa53d2106
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
(cherry picked from commit
97f16a76db29269619d9a1b45d4cea49026a5b6a)
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Ta-wei Yen [Mon, 4 Dec 2017 23:54:37 +0000 (15:54 -0800)]
Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled
Due to notification channel changes in O these settings are no longer
applicable.
Change-Id: Iaac6fda37bc989e09e7e4b1c20f2434be3feee92
Fixes:
38205149
Test: Doc change.
Hansong Zhang [Tue, 12 Dec 2017 19:22:12 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am:
5b6b73800c
am:
64d81fbf33
Change-Id: I1be05324ec0134c801de08e0f60139c341261f33
Hansong Zhang [Tue, 12 Dec 2017 19:11:56 +0000 (19:11 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
am:
5b6b73800c
Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Jack Yu [Tue, 12 Dec 2017 18:29:04 +0000 (18:29 +0000)]
Merge "Moved data connection response into system api." am:
8ded1cde4a
am:
88aa63a6a2
Change-Id: Iac46d7f4c0d6c8d46df77c6349b325b5dd5831b3
Jack Yu [Tue, 12 Dec 2017 18:18:09 +0000 (18:18 +0000)]
Merge "Moved data connection response into system api."
am:
8ded1cde4a
Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."
Eric Erfanian [Thu, 7 Dec 2017 00:27:53 +0000 (16:27 -0800)]
Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.
Test: no existing unit tests found. could use some pointers
Bug:
35963245
Change-Id: I3ed8ac5ad7300c44f87e2573d9409b3a92b98ab6
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
Todd Kennedy [Tue, 12 Dec 2017 15:14:20 +0000 (15:14 +0000)]
Merge "Block the upgrade of persistent apps" am:
0b30d95dc8
am:
6de91158d7
Change-Id: I729df40376b972461908d22593b63f4f5399e356
Todd Kennedy [Tue, 12 Dec 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Block the upgrade of persistent apps"
am:
0b30d95dc8
Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714
Todd Kennedy [Tue, 12 Dec 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Block the upgrade of persistent apps"
OSDN Git Service
