OSDN Git Service
Jean-Michel Trivi [Mon, 28 Aug 2017 16:47:44 +0000 (16:47 +0000)]
Merge "AudioManager: permission annotations" into oc-mr1-dev am:
72cf1a4fa2
am:
3be893e449
Change-Id: Ife6cd6b5772df03f0511c42b635984e840496626
Jean-Michel Trivi [Mon, 28 Aug 2017 16:38:41 +0000 (16:38 +0000)]
Merge "AudioManager: permission annotations" into oc-mr1-dev
am:
72cf1a4fa2
Change-Id: I27394a0801a9d5d31d4ac18b3b773268b6d2fa10
Jean-Michel Trivi [Mon, 28 Aug 2017 16:27:27 +0000 (16:27 +0000)]
Merge "AudioManager: permission annotations" into oc-mr1-dev
Julia Reynolds [Mon, 28 Aug 2017 15:23:13 +0000 (15:23 +0000)]
Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev am:
b6cf707632
am:
de0bdc59e1
Change-Id: Ie2066bfc97c977056fe114332e5bf11ffc468644
Julia Reynolds [Mon, 28 Aug 2017 15:08:33 +0000 (15:08 +0000)]
Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
am:
b6cf707632
Change-Id: Id161a3fd805c7554ebb1799a358354e719ebde10
TreeHugger Robot [Mon, 28 Aug 2017 15:00:48 +0000 (15:00 +0000)]
Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
Lorenzo Colitti [Mon, 28 Aug 2017 13:18:06 +0000 (13:18 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32 am:
3dd0137ee5 am:
7da529950c
am:
06e3f87be4
Change-Id: I31aab4887f41145ac62afed57e013168541cd351
Lorenzo Colitti [Mon, 28 Aug 2017 13:08:37 +0000 (13:08 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32 am:
3dd0137ee5
am:
7da529950c
Change-Id: Id37a48a7a27a6e2550824873ea376e16b3c949b2
Lorenzo Colitti [Mon, 28 Aug 2017 12:58:30 +0000 (12:58 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32
am:
3dd0137ee5
Change-Id: I40e6535b22688b47845e6c57d3f13963bc8a6201
Lorenzo Colitti [Mon, 28 Aug 2017 12:49:29 +0000 (12:49 +0000)]
Merge "Trivial change to test expectations."
am:
c0d8300b32
Change-Id: I58155e3edb424ea6918a3d2bb8e284e61346765f
Treehugger Robot [Mon, 28 Aug 2017 12:39:29 +0000 (12:39 +0000)]
Merge "Trivial change to test expectations."
Hugo Benichi [Mon, 28 Aug 2017 12:35:38 +0000 (12:35 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd am:
b6805dc02f am:
da71487a59
am:
d1b64046a0
Change-Id: Ifccff9f3cfccdb2cdddf2f07561f0787a48bc0f8
Hugo Benichi [Mon, 28 Aug 2017 12:21:10 +0000 (12:21 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd am:
b6805dc02f
am:
da71487a59
Change-Id: I06661bd6bd1456ba34a3bbdb52c120ac01da9d61
Hugo Benichi [Mon, 28 Aug 2017 12:11:28 +0000 (12:11 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd
am:
b6805dc02f
Change-Id: I1a19e6fbb0cb13262e90b171d861062469078fb6
Hugo Benichi [Mon, 28 Aug 2017 12:01:25 +0000 (12:01 +0000)]
Merge "Nat464Xlat: clat management cleanup"
am:
81b179cfdd
Change-Id: Ic3808a1afe48efac745b1b378fb12cc5678918ec
Hugo Benichi [Mon, 28 Aug 2017 11:47:08 +0000 (11:47 +0000)]
Merge "Nat464Xlat: clat management cleanup"
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
(cherry picked from commit
0fee732ca579bbc4320ade35f238bdfa1aa500f5)
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iec8af5191b4da495e47ef97d70a03a5d2e75cfe2
Lorenzo Colitti [Mon, 28 Aug 2017 08:43:54 +0000 (08:43 +0000)]
Merge "switch to native_handle_create() for passing ownership" am:
5fe8e51904 am:
639808f1c7 am:
b3a345b893
am:
ca7fc9fca8
Change-Id: Idadaa5f93cafd7d69e5e170387f9b330354ef90b
Lorenzo Colitti [Mon, 28 Aug 2017 08:29:52 +0000 (08:29 +0000)]
Merge "switch to native_handle_create() for passing ownership" am:
5fe8e51904 am:
639808f1c7
am:
b3a345b893
Change-Id: Id7a525424ecb35ee857af271873a939d1c032df7
Lorenzo Colitti [Mon, 28 Aug 2017 08:20:15 +0000 (08:20 +0000)]
Merge "switch to native_handle_create() for passing ownership" am:
5fe8e51904
am:
639808f1c7
Change-Id: I3bd8f99cc3c1a6bc435721c7dc18e061f61fc175
Lorenzo Colitti [Mon, 28 Aug 2017 08:11:20 +0000 (08:11 +0000)]
Merge "switch to native_handle_create() for passing ownership"
am:
5fe8e51904
Change-Id: I101de0e7e76f61bd3f05183f4a13ac94c79ae1aa
Lorenzo Colitti [Mon, 28 Aug 2017 08:02:19 +0000 (08:02 +0000)]
Merge "switch to native_handle_create() for passing ownership"
Erik Kline [Mon, 28 Aug 2017 07:14:47 +0000 (07:14 +0000)]
Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev am:
91f4071ff6
am:
49c8948d12
Change-Id: Ia0addb7e869191555ee2ebf8afabb6c0cbe50cb5
Erik Kline [Mon, 28 Aug 2017 07:02:02 +0000 (07:02 +0000)]
Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev
am:
91f4071ff6
Change-Id: Ic834e09970fc08036807f914b23016b897e5282f
TreeHugger Robot [Mon, 28 Aug 2017 06:47:52 +0000 (06:47 +0000)]
Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev
Hugo Benichi [Tue, 27 Jun 2017 06:13:20 +0000 (15:13 +0900)]
Nat464Xlat: clat management cleanup
This patch does some minor refactoring of clat starting/stopping code:
- remove unused LinkProperties arguments in updateClat
- remove unused Context argument in Nat464Xlat ctor
- introduce ensureClatIsStarted and ensureClatIsStopped methods and
simplify updateClat
- add clatd to NetworkAgentInfo toString() method
- clarify some comments
This changes prepare for moving BaseNetworkObserver callbacks to
ConnectivityService.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to IPv6 only network and went to test-ipv6.com
Change-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca
TreeHugger Robot [Sun, 27 Aug 2017 21:04:12 +0000 (21:04 +0000)]
Merge "Remove unused methods from SuggestionList"
TreeHugger Robot [Sat, 26 Aug 2017 16:06:07 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 26 Aug 2017 15:14:04 +0000 (15:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Siarhei Vishniakou [Sat, 26 Aug 2017 11:44:45 +0000 (11:44 +0000)]
Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev am:
d7d9b8939e
am:
235b6fb59c -s ours
Change-Id: Ibb5aed59c48bb722cdca1942d1e85c26588a8dba
Siarhei Vishniakou [Sat, 26 Aug 2017 11:33:16 +0000 (11:33 +0000)]
Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev
am:
d7d9b8939e
Change-Id: I4bb5e08e8019527bd5a3847ae32798187e0a4b0a
TreeHugger Robot [Sat, 26 Aug 2017 11:26:42 +0000 (11:26 +0000)]
Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev
Winson Chung [Sat, 26 Aug 2017 06:41:39 +0000 (06:41 +0000)]
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev am:
3ea1e3d57d
am:
6514dca8ee
Change-Id: Ic21c453ab216bb3d4a58542c4efd1f06ee66bc9b
Winson Chung [Sat, 26 Aug 2017 06:30:34 +0000 (06:30 +0000)]
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
am:
3ea1e3d57d
Change-Id: I82384a2fb55e4f66e627a9e70f729fb5a2bff8a1
TreeHugger Robot [Sat, 26 Aug 2017 06:22:34 +0000 (06:22 +0000)]
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
TreeHugger Robot [Sat, 26 Aug 2017 05:19:14 +0000 (05:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Siarhei Vishniakou [Sat, 26 Aug 2017 04:44:01 +0000 (21:44 -0700)]
DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel
CREATE2 structs were introduced after kernel 3.18,
so cannot compile user code with uapi headers from
newer 3.18+ kernels. If using CREATE structs then
compatibility is preserved.
Bug:
64981084
Test: bit
Change-Id: I97c7725918b09a817a51c13384ac2d55a6cfab25
CtsHardwareTestCases:android.hardware.input.cts.tests.GamepadTestCase
TreeHugger Robot [Sat, 26 Aug 2017 04:50:47 +0000 (04:50 +0000)]
Merge "Fix build breakage."
Bill Yi [Sat, 26 Aug 2017 04:20:59 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice85fa46877ff3a9fae73bb735b9a6b0636ff814
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 26 Aug 2017 03:50:11 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 26 Aug 2017 03:40:48 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 26 Aug 2017 03:39:54 +0000 (03:39 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 26 Aug 2017 03:37:55 +0000 (03:37 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 26 Aug 2017 03:15:48 +0000 (03:15 +0000)]
Merge "Correct missed use of work paint for hyphenation"
Jack He [Sat, 26 Aug 2017 03:02:57 +0000 (03:02 +0000)]
Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev am:
4ce5d83e52
am:
d28ec53e96
Change-Id: I506c784a859a96361fec665960072e7b10605f8b
Michael Wright [Sat, 26 Aug 2017 02:53:45 +0000 (02:53 +0000)]
Merge "O MR1 is API 27" into oc-mr1-dev am:
d489d122f4
am:
800af77f9c
Change-Id: If3e76e14e60573d8f2e188abd95e3ef634eda3a2
Jack He [Sat, 26 Aug 2017 02:51:31 +0000 (02:51 +0000)]
Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev
am:
4ce5d83e52
Change-Id: I167d81324b09e7b10ccaa23f59167533fa4db815
Michael Wright [Sat, 26 Aug 2017 02:41:46 +0000 (02:41 +0000)]
Merge "O MR1 is API 27" into oc-mr1-dev
am:
d489d122f4
Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
TreeHugger Robot [Sat, 26 Aug 2017 02:37:54 +0000 (02:37 +0000)]
Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev
TreeHugger Robot [Sat, 26 Aug 2017 02:29:51 +0000 (02:29 +0000)]
Merge "O MR1 is API 27" into oc-mr1-dev
Jean-Michel Trivi [Sat, 26 Aug 2017 02:20:49 +0000 (19:20 -0700)]
AudioManager: permission annotations
Add permission annotations on audio focus @SystemApi methods.
Ignore REQUIRE_PERMISSION error (125) for:
- deprecated abandonAudioFocus() method: the check is on the
request call
- isHdmiSystemAudioSupported() method, it's not clear if it's
being used.
Test: remove "-hide 125" in Android.mk and make, verify no errors\
on AudioManager.java
Bug:
62343127
Change-Id: I62526db0c6dabcc34224c589506d611519de6abc
TreeHugger Robot [Sat, 26 Aug 2017 02:15:59 +0000 (02:15 +0000)]
Merge "Update Settings properly when no Spell Checker is available."
Bill Yi [Sat, 26 Aug 2017 02:12:39 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib751f071d383012c82bce9417651ccc0fee1b507
Auto-generated-cl: translation import
Bill Yi [Sat, 26 Aug 2017 02:02:41 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia94726b14e34c37472e0f1f66cdeab184e56c7bd
Auto-generated-cl: translation import
Bill Yi [Sat, 26 Aug 2017 01:24:22 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53db748a3c15d105f7ad6fa4bfe1797736e21e94
Auto-generated-cl: translation import
Selim Cinek [Sat, 26 Aug 2017 01:20:08 +0000 (01:20 +0000)]
Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev am:
77af296764
am:
46748d5070
Change-Id: Id0cc04896bb3eb7b8a56ffef49e90ad765add7f7
Bill Yi [Sat, 26 Aug 2017 01:14:31 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d9bb77c46d73eba2097983b0b94e6de1f14325d
Auto-generated-cl: translation import
Yongqin Liu [Sat, 26 Aug 2017 01:11:43 +0000 (01:11 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" am:
b5b1308f2f am:
c54162d3ff am:
d395b2f497
am:
166c043151
Change-Id: I8698debacb0ac7d210a8f2fc657d0ae26effa17c
Fan Zhang [Sat, 26 Aug 2017 01:08:27 +0000 (18:08 -0700)]
Remove unused methods from SuggestionList
Test: robotests
Change-Id: Ibfd5606917a2f6e2f22bca15c297ef34eb3cfe1e
Selim Cinek [Sat, 26 Aug 2017 01:07:36 +0000 (01:07 +0000)]
Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev
am:
77af296764
Change-Id: I7e54e439ec68a5a6d329492d4a3c135528fed5e1
TreeHugger Robot [Sat, 26 Aug 2017 01:00:38 +0000 (01:00 +0000)]
Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev
Bill Yi [Sat, 26 Aug 2017 00:58:31 +0000 (17:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I123bbb2e20c1a098141a388ce3a595c105488148
Auto-generated-cl: translation import
Yongqin Liu [Sat, 26 Aug 2017 00:56:15 +0000 (00:56 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" am:
b5b1308f2f am:
c54162d3ff
am:
d395b2f497
Change-Id: I9e45b3958009dd01adbbf527b8b8edb98a0ba4a4
Yongqin Liu [Sat, 26 Aug 2017 00:46:07 +0000 (00:46 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" am:
b5b1308f2f
am:
c54162d3ff
Change-Id: Ie9225108f7ac354212a186d2e26d1f278d9fb7e8
Yongqin Liu [Sat, 26 Aug 2017 00:36:54 +0000 (00:36 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
am:
b5b1308f2f
Change-Id: I05f37f0ca0a18bd291aea8d49e2747b40d30b572
Treehugger Robot [Sat, 26 Aug 2017 00:24:23 +0000 (00:24 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
Bill Yi [Sat, 26 Aug 2017 00:06:12 +0000 (17:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I688e196bbeffe3b67950b3e96ae5118166dce9d7
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 25 Aug 2017 23:57:59 +0000 (23:57 +0000)]
Merge "Add checks for Kotlin keywords and operator functions."
Wale Ogunwale [Fri, 25 Aug 2017 23:46:02 +0000 (16:46 -0700)]
Fix build breakage.
The code is some how triggering a compiler bug.
Test: N/A
Change-Id: If4eef989027a70c388cbcd311e5de4da76bae329
Guliz Tuncay [Thu, 17 Aug 2017 22:25:38 +0000 (15:25 -0700)]
Update Settings properly when no Spell Checker is available.
Currently, Settings is not being updated properly when the current spell
checker service is removed or disabled and there is no other spell
checker service available. The correct behavior is that Secure.Settings
should be updated with empty string to indicate there is no selected
spell checker service.
Fixes:
64812014
Test: Manually as follows:
0. Make sure AOSP keyboard is installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
7. adb uninstall com.example.android.samplespellcheckerservice
8. adb shell settings get --user 0 secure selected_spell_checker
-> empty
9. adb root
10. adb shell settings get --user 0 secure selected_spell_checker
-> empty
11. adb shell pm enable com.android.inputmethod.latin
12. adb shell settings get --user 0 secure selected_spell_checker
Change-Id: I30902a3d94f2ddef33f4a8067799e98322ae3a03
TreeHugger Robot [Fri, 25 Aug 2017 23:33:17 +0000 (23:33 +0000)]
Merge "Adding group divider support in Android Menus"
Jack He [Thu, 24 Aug 2017 22:21:40 +0000 (15:21 -0700)]
Bluetooth: Add developer options to show devices without names
* Bluetooth developer can enable it to pair with and send file to
devices without names
Bug:
34685932
Test: make, RunSettingsLibRoboTest, RunSettingsRoboTest, pair with
devices
Change-Id: I529609008f9ba69bda47d8b6d8c434a70f9de491
Roger 1 Jönsson [Fri, 25 Aug 2017 23:22:29 +0000 (23:22 +0000)]
Merge "Create new trace object when logging from new thread" into oc-mr1-dev am:
071edf5b09
am:
1decec5937
Change-Id: Ie2cb8e2553937eb78f2644ff7f49defe73d147e5
Roger 1 Jönsson [Fri, 25 Aug 2017 23:13:00 +0000 (23:13 +0000)]
Merge "Create new trace object when logging from new thread" into oc-mr1-dev
am:
071edf5b09
Change-Id: I7b0c2521a3e010b9ddcc316ff59c97b42888d94c
Android Build Merger (Role) [Fri, 25 Aug 2017 23:07:52 +0000 (23:07 +0000)]
Merge "Merge "Roll back nav bar interface to version 2" into oc-mr1-dev am:
e2a372075d am:
93ab9a2727"
Jason Monk [Fri, 25 Aug 2017 23:05:05 +0000 (23:05 +0000)]
Merge "Roll back nav bar interface to version 2" into oc-mr1-dev am:
e2a372075d
am:
93ab9a2727
Change-Id: I3bb34cf5b30642170d97162e2922377359066770
Seigo Nonaka [Fri, 25 Aug 2017 23:05:02 +0000 (23:05 +0000)]
Merge "Dump minikin layout stats as a part of gfxinfo."
TreeHugger Robot [Fri, 25 Aug 2017 23:04:46 +0000 (23:04 +0000)]
Merge "Create new trace object when logging from new thread" into oc-mr1-dev
Jason Monk [Fri, 25 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Roll back nav bar interface to version 2" into oc-mr1-dev
am:
e2a372075d
Change-Id: I5c19b76cb21b6c65be8b3b243ef9e529968d7d59
Roozbeh Pournader [Fri, 25 Aug 2017 22:53:33 +0000 (15:53 -0700)]
Correct missed use of work paint for hyphenation
The change in I0b95a10c05711350950d6c8d6501f6af9414d413 copied the
Paint to a work paint to make sure we don't modify it, but missed
actually using that Paint, resulting in hyphenation basically getting
ignored in getLineExtent().
Now we correctly pass the work paint to the TextLine used.
Change-Id: Ida89ba2b11d35d93012abb0adf9bb29d1b09c2d2
Fixes:
64998667
Bug:
33388205
Bug:
64452136
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Test: bit FrameworksCoreTests:android.text.
Test: bit CtsTextTestCases:android.text.cts.
TreeHugger Robot [Fri, 25 Aug 2017 22:50:03 +0000 (22:50 +0000)]
Merge "Roll back nav bar interface to version 2" into oc-mr1-dev
Fyodor Kupolov [Fri, 25 Aug 2017 22:48:03 +0000 (22:48 +0000)]
Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev am:
9d656d0305
am:
ac81767800
Change-Id: Ide64dc5a7a1e6fbd017660b081470fd9c3ba4f91
Felipe Leme [Fri, 25 Aug 2017 22:39:50 +0000 (22:39 +0000)]
Merge "Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev am:
4aefa37d9e" into oc-mr1-dev-plus-aosp
am:
7743c44fac
Change-Id: I46dc4aecedd5b19ba5e741c4c8a3daaa7d3c080d
Selim Cinek [Fri, 25 Aug 2017 22:07:36 +0000 (22:07 +0000)]
Revert "Support keyboard long-press on notifications"
This reverts commit
2ca798932ea2945184df1c5500b5b9f08af9af55.
Fixes:
65061056
Change-Id: I88bcb549b9e76958d280625a96796791b6f29060
Felipe Leme [Fri, 25 Aug 2017 22:35:00 +0000 (22:35 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015 am:
d29128d699" into oc-mr1-dev-plus-aosp
am:
08a6dde180
Change-Id: If13789fd96dde6ded9c32eabfcb62e29facd3673
Android Build Merger (Role) [Fri, 25 Aug 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev am:
9938901bbc" into oc-mr1-dev-plus-aosp am:
5776ad9e40"
Fyodor Kupolov [Fri, 25 Aug 2017 22:30:20 +0000 (22:30 +0000)]
Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev
am:
9d656d0305
Change-Id: I78cb61a5bc667fe2d902b49e292968941251cdc6
TreeHugger Robot [Fri, 25 Aug 2017 22:28:57 +0000 (22:28 +0000)]
Merge "Select only preinstalled Spell Checker Services"
Brad Ebinger [Fri, 25 Aug 2017 22:28:20 +0000 (22:28 +0000)]
Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev am:
9938901bbc" into oc-mr1-dev-plus-aosp
am:
5776ad9e40
Change-Id: Ic1fb1992b6d12ce51e6a3f59b5823e52e2659288
Adrian Roos [Fri, 25 Aug 2017 22:23:13 +0000 (22:23 +0000)]
Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7 am:
3825027579" into oc-mr1-dev-plus-aosp
am:
9a224d4aba
Change-Id: Ie9d8c5a90e9763a7d45f50a88284d8029ca18525
TreeHugger Robot [Fri, 25 Aug 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev
Android Build Merger (Role) [Fri, 25 Aug 2017 22:15:15 +0000 (22:15 +0000)]
Merge "Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev am:
4aefa37d9e" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 25 Aug 2017 22:13:29 +0000 (22:13 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015 am:
d29128d699" into oc-mr1-dev-plus-aosp
Felipe Leme [Fri, 25 Aug 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev
am:
4aefa37d9e
Change-Id: Iac1cc5205d90e2cce2206585bcfba93ed737a58a
Android Build Merger (Role) [Fri, 25 Aug 2017 22:05:23 +0000 (22:05 +0000)]
Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev am:
9938901bbc" into oc-mr1-dev-plus-aosp
Felipe Leme [Fri, 25 Aug 2017 22:05:01 +0000 (22:05 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015
am:
d29128d699
Change-Id: If8eae5bc9f2985c913179b2fc881d7bf03510276
Brad Ebinger [Fri, 25 Aug 2017 22:01:06 +0000 (22:01 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev
am:
9938901bbc
Change-Id: I7b576ee7e38f141075cae094e3d1f74b7145d53f
Adrian Roos [Fri, 25 Aug 2017 22:01:05 +0000 (22:01 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7 am:
7835aad0f6
am:
77d12993b8
Change-Id: Ie7266376fd48357fbbcf0492c6a91baf3bae484e
Android Build Merger (Role) [Fri, 25 Aug 2017 22:00:15 +0000 (22:00 +0000)]
Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7 am:
3825027579" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 25 Aug 2017 21:58:11 +0000 (21:58 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev
OSDN Git Service
