OSDN Git Service
Thecrazyskull [Sun, 4 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1
am:
6270dce2cd
Change-Id: Ie8ce734935d9950c515675710772aa5f3c80c988
Thecrazyskull [Sat, 3 Jun 2017 23:55:52 +0000 (23:55 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
am:
46f7199cb1
Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
Treehugger Robot [Sat, 3 Jun 2017 23:49:37 +0000 (23:49 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
Mikhail Malakhov [Sat, 3 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a
am:
933cdd5503
Change-Id: I0fbdadf1b42543936f3ed657b52da23978a0fe16
Mikhail Malakhov [Sat, 3 Jun 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am:
c7697e9b8a
Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
Treehugger Robot [Sat, 3 Jun 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
Thecrazyskull [Thu, 2 Mar 2017 19:55:59 +0000 (14:55 -0500)]
ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
Sheng Wang [Fri, 2 Jun 2017 00:25:17 +0000 (00:25 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185
am:
161e3d14e1
Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
Mikhail Malakhov [Thu, 20 Oct 2016 19:45:18 +0000 (22:45 +0300)]
Sometime, Settings app crash when AllowBindAppWidgetActivity closing
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@
5817135
Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com>
xudiwen [Thu, 1 Jun 2017 19:05:23 +0000 (19:05 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01
am:
957c4d7720
Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
xudiwen [Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
am:
2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
Treehugger Robot [Thu, 1 Jun 2017 18:51:43 +0000 (18:51 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
Steven Ng [Wed, 17 May 2017 22:43:10 +0000 (22:43 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
Steven Ng [Wed, 17 May 2017 22:30:42 +0000 (23:30 +0100)]
DO NOT MERGE Fix build failure due to missing guava target
Test: 1) build sailfish-userdebug successfully
2) m SettingsTests -j32 built successfully
Bug:
33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
Steven Ng [Wed, 17 May 2017 21:01:46 +0000 (21:01 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours
am:
6496c3757b -s ours
Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2
Steven Ng [Wed, 17 May 2017 17:21:44 +0000 (18:21 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Steven Ng [Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791
am:
e05ef08a8e -s ours
Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
am:
c07f39c791
Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994
Steven Ng [Tue, 16 May 2017 21:18:12 +0000 (21:18 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
Steven Ng [Tue, 16 May 2017 21:17:58 +0000 (21:17 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Steven Ng [Thu, 11 May 2017 17:31:08 +0000 (18:31 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Phil Weaver [Fri, 12 May 2017 22:17:54 +0000 (22:17 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c
am:
611fda4a97
Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
Phil Weaver [Fri, 12 May 2017 22:16:26 +0000 (22:16 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239
am:
7f1bc85e4c
Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
Phil Weaver [Fri, 12 May 2017 22:14:22 +0000 (22:14 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a
am:
8247008239
Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
Phil Weaver [Fri, 12 May 2017 22:11:56 +0000 (22:11 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60
am:
9b8abd652a
Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
Phil Weaver [Fri, 12 May 2017 22:08:53 +0000 (22:08 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4
am:
adf8f8bc60
Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
Phil Weaver [Fri, 12 May 2017 22:07:24 +0000 (22:07 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67
am:
11b6279ed4
Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
Phil Weaver [Fri, 12 May 2017 22:05:52 +0000 (22:05 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e
am:
beb7f31d67
Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f
am:
5d6d70a50e
Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am:
9a1b4eb21f
Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
xudiwen [Tue, 9 May 2017 09:30:57 +0000 (17:30 +0800)]
NullPointerException when running monkey test in IccLockSettings
In Android N, finish() in onCreate() cannot avoid onViewCreated() lifecycle
in Fragment, so a crash occurs in com.android.settings.IccLockSettings
because of insecure call in updatePreference().
It's a tiny bug only appears when running monkey test.
Test: run monkey test with page IccLockSettings.
This bug was reported to Google Issue Tracker.
Link: https://issuetracker.google.com/issues/38152568
Change-Id: I143b046fd7ac5ffba55e51254c7dd068274d342e
Signed-off-by: xudiwen <xudiwen@xiaomi.com>
Phil Weaver [Tue, 9 May 2017 17:51:32 +0000 (10:51 -0700)]
Don't enable a11y service if scary dialog obscured
Bug:
38134845
Test: Trivial back-port of ag/
2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
nharold [Sat, 6 May 2017 02:07:30 +0000 (02:07 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1
am:
98f209c6e5
Change-Id: I5c7760471d2e48df20955122507b503ca546954e
nharold [Sat, 6 May 2017 01:57:56 +0000 (01:57 +0000)]
Merge "Update references to use PhoneConstantConversion"
am:
79694e79d1
Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge "Update references to use PhoneConstantConversion"
Nathan Harold [Tue, 20 Dec 2016 01:50:34 +0000 (17:50 -0800)]
Update references to use PhoneConstantConversion
Bug:
33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
Miao Miao (è‹—è‹—) [Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b
am:
c6e3467cc2
Change-Id: If6ad081e117a94df84d041776649af63c392cc30
Miao Miao (è‹—è‹—) [Tue, 2 May 2017 17:44:08 +0000 (17:44 +0000)]
Merge "Settings crash when receiving data state broadcast"
am:
2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
Treehugger Robot [Tue, 2 May 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Settings crash when receiving data state broadcast"
Jaekyun Seok [Mon, 1 May 2017 23:17:29 +0000 (23:17 +0000)]
Merge "Generate license html file from xml files of partitions" am:
04a7e0a73a
am:
f8aaf9ecdc
Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
Jaekyun Seok [Mon, 1 May 2017 23:15:34 +0000 (23:15 +0000)]
Merge "Generate license html file from xml files of partitions"
am:
04a7e0a73a
Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
Treehugger Robot [Mon, 1 May 2017 23:08:17 +0000 (23:08 +0000)]
Merge "Generate license html file from xml files of partitions"
Jaekyun Seok [Tue, 18 Apr 2017 06:22:01 +0000 (15:22 +0900)]
Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
37099941
Merged-In: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
(cherry picked from commit
74812873f41adbd34ab3ff4fbd7dcbb8f6fde233)
Ajay Panicker [Thu, 27 Apr 2017 17:08:48 +0000 (17:08 +0000)]
Merge "Limit btsnoop file size (4/8)" am:
7baae2a924
am:
7469ff3e1c
Change-Id: I34175cce212bd5c291481bee5758501b741f197c
Ajay Panicker [Thu, 27 Apr 2017 17:06:18 +0000 (17:06 +0000)]
Merge "Limit btsnoop file size (4/8)"
am:
7baae2a924
Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
Treehugger Robot [Thu, 27 Apr 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Limit btsnoop file size (4/8)"
Miao Miao (è‹—è‹—) [Tue, 14 Mar 2017 07:51:54 +0000 (15:51 +0800)]
Settings crash when receiving data state broadcast
Stress/Stability testing, Settings crash when receiving data state
broadcast
Solution: Do null judgement before function was called
Test: Stress/Stability test
Change-Id: Id71448ed89eeffcea268c4a2e7154d9ea7639db4
rongrong.x.gao [Thu, 27 Apr 2017 04:07:11 +0000 (04:07 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am:
2503ea04fb
am:
220e085953
Change-Id: Ia1596c05770c7ecf48830bf37f2f040c20931606
rongrong.x.gao [Thu, 27 Apr 2017 04:05:09 +0000 (04:05 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
am:
2503ea04fb
Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6
Treehugger Robot [Thu, 27 Apr 2017 03:56:27 +0000 (03:56 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
Ajay Panicker [Tue, 18 Apr 2017 03:46:29 +0000 (20:46 -0700)]
Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
rongrong.x.gao [Mon, 18 Apr 2016 07:46:06 +0000 (15:46 +0800)]
Fix MUT cannot connect to AP by WPS after rotating MUT
While MUT is connecting to AP, rotate MUT,
then MUT can not connect to AP by WPS.
To ensure MUT can connect to AP by WPS, invoke startWps() to
re-connect after rotating MUT.
Bug:
37557898
Change-Id: Icbaff96895ad52f5c1bc6df5d180f69989527667
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
Volume can not be updated in Sound¬ification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug:
37558283
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
Marie Janssen [Fri, 21 Apr 2017 18:41:41 +0000 (18:41 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4
am:
28bbd5bacb
Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
Marie Janssen [Fri, 21 Apr 2017 18:38:40 +0000 (18:38 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
am:
6c142b35b4
Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
Treehugger Robot [Fri, 21 Apr 2017 18:31:44 +0000 (18:31 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
Anas Karbila [Thu, 20 Apr 2017 23:22:27 +0000 (23:22 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca
am:
aaf9fdc5cf
Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
Anas Karbila [Thu, 20 Apr 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
am:
b6bbbc91ca
Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
Treehugger Robot [Thu, 20 Apr 2017 23:14:18 +0000 (23:14 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
Anas Karbila [Thu, 20 Apr 2017 12:44:13 +0000 (21:44 +0900)]
Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.
Issue: https://issuetracker.google.com/
37543358
Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context
Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
Anas Karbila [Thu, 13 Apr 2017 17:27:36 +0000 (17:27 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am:
31ec85a913
am:
282a2317b9
Change-Id: I7775df15acf1cb74cad94e3e23dd6faf5d98412e
Anas Karbila [Thu, 13 Apr 2017 17:22:04 +0000 (17:22 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
am:
31ec85a913
Change-Id: Ibaa2a738d9f14570be88968cf340d474118358a4
Treehugger Robot [Thu, 13 Apr 2017 17:14:21 +0000 (17:14 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
Anas Karbila [Sat, 8 Apr 2017 10:48:43 +0000 (19:48 +0900)]
Settings: Fix wrong wifi drawable in screen zooming preview
We should use the same wifi drawable for the screen
zooming preview as the one the real settings menu
is using.
Change-Id: Ibb0d45b9f5aa431b52864aa826ea84c49b2d3fa0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Dmitry Dementyev [Wed, 12 Apr 2017 20:32:11 +0000 (20:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours am:
43e154604a -s ours am:
d4d2b47d48 -s ours
am:
521e705eaf -s ours
Change-Id: I8ceb64d42fdb7853609ed94a8304ee71ac904e68
Dmitry Dementyev [Wed, 12 Apr 2017 20:26:40 +0000 (20:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours am:
43e154604a -s ours
am:
d4d2b47d48 -s ours
Change-Id: Ib983d50a3e079c1cf72fddae475d10a441def7dd
Dmitry Dementyev [Wed, 12 Apr 2017 20:21:39 +0000 (20:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours am:
ed6872b3d5 -s ours
am:
43e154604a -s ours
Change-Id: I5d559b468d1d6165162d78cbde84b45e05e7b5ec
Dmitry Dementyev [Wed, 12 Apr 2017 20:15:40 +0000 (20:15 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours am:
89657550ac -s ours
am:
ed6872b3d5 -s ours
Change-Id: I0aafd94271cab6fd2fb9acebca3c41299ec9550f
Dmitry Dementyev [Wed, 12 Apr 2017 20:10:07 +0000 (20:10 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours am:
704c02db08 -s ours
am:
89657550ac -s ours
Change-Id: I3bb7c6e6f2a8abcad3304c43e611df855e79dad9
Dmitry Dementyev [Wed, 12 Apr 2017 20:04:11 +0000 (20:04 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours am:
b23bdee761 -s ours
am:
704c02db08 -s ours
Change-Id: I29ab4a6fb0dfbd3f03b9be71f28ff9f36893bc59
Dmitry Dementyev [Wed, 12 Apr 2017 20:00:05 +0000 (20:00 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours
am:
b23bdee761 -s ours
Change-Id: Ie66bdaba9900b112cee1d9503a332b7bbe203283
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours
am:
56dc835f3c -s ours
Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours
am:
5f32a5b5f3 -s ours
Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours
am:
2d9593f8f1 -s ours
Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours
am:
13b12fd61d -s ours
Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours
am:
22db6274bf -s ours
Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a
am:
0c07b38054 -s ours
Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e
am:
bac5163a9a
Change-Id: Ib70241c596aca047a096318eb2026634692f8620
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am:
ea55e6331e
Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
Honglu Yin [Mon, 10 Apr 2017 23:22:49 +0000 (23:22 +0000)]
Merge "Title is different after tapping "Memory used by apps"" am:
7d9146e10a
am:
4604741c51
Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
Jack He [Mon, 10 Apr 2017 23:11:42 +0000 (23:11 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" am:
3d08bedba2
am:
9e1e430f06
Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
Honglu Yin [Mon, 10 Apr 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Title is different after tapping "Memory used by apps""
am:
7d9146e10a
Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
Jack He [Mon, 10 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
am:
3d08bedba2
Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
Treehugger Robot [Mon, 10 Apr 2017 22:53:07 +0000 (22:53 +0000)]
Merge "Title is different after tapping "Memory used by apps""
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
Marie Janssen [Thu, 6 Apr 2017 00:17:05 +0000 (00:17 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" am:
4dc556bda8
am:
c27d7effb0
Change-Id: I2c477f40e874ad33a5e3a218370f49e744c68787
Marie Janssen [Thu, 6 Apr 2017 00:14:07 +0000 (00:14 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
am:
4dc556bda8
Change-Id: I3df22131a424007c5e0448166787598c7d77ea92
Marie Janssen [Thu, 6 Apr 2017 00:01:58 +0000 (00:01 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
Robin Lee [Wed, 5 Apr 2017 13:43:17 +0000 (13:43 +0000)]
Merge "RejectedExecutionException in DataUsageLIst" am:
7a8121fdd9
am:
543a98806f
Change-Id: Idc1ac1b3628afb4bdee4192305980f4dc03eeb5a
Robin Lee [Wed, 5 Apr 2017 13:40:46 +0000 (13:40 +0000)]
Merge "RejectedExecutionException in DataUsageLIst"
am:
7a8121fdd9
Change-Id: I787cbc2abf247206d6945bdd4bda33479f78b634
Robin Lee [Wed, 5 Apr 2017 13:35:51 +0000 (13:35 +0000)]
Merge "RejectedExecutionException in DataUsageLIst"
Jack He [Fri, 31 Mar 2017 17:51:22 +0000 (10:51 -0700)]
Add developer menu entry to enable Bluetooth inband ringing
Bug:
19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
Hemant Gupta [Mon, 3 Apr 2017 17:54:06 +0000 (17:54 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am:
e270a6aa85
am:
2ffab51c0e
Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
Hemant Gupta [Mon, 3 Apr 2017 17:50:36 +0000 (17:50 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am:
e270a6aa85
Change-Id: Ia5108737add480f2cce52663f13d496653c37320
Treehugger Robot [Mon, 3 Apr 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
Bill Yi [Sun, 2 Apr 2017 03:58:11 +0000 (03:58 +0000)]
Import translations. DO NOT MERGE
am:
66ff06da2f -s ours
Change-Id: I82b52721cd65db19cbdcc0c4d062ab4875a9d6f6
OSDN Git Service
