OSDN Git Service
Bryce Lee [Tue, 30 Jun 2015 20:21:48 +0000 (20:21 +0000)]
am
5cd293b3: Merge "Merge commit \'
91d2cbf4\' into manualmerge" into mnc-dev
* commit '
5cd293b37946ccc60c148e4a17e5f59620999046':
Only enable theater mode by button press after setup.
Jason Monk [Tue, 30 Jun 2015 20:21:44 +0000 (20:21 +0000)]
am
583d2d9b: Merge "Don\'t allow do not disturb when volume restricted" into mnc-dev
* commit '
583d2d9ba22902eecf97bc9cf98dd27387b50fb3':
Don't allow do not disturb when volume restricted
Bryce Lee [Tue, 30 Jun 2015 20:15:31 +0000 (20:15 +0000)]
Merge "Merge commit '
91d2cbf4' into manualmerge" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Don't allow do not disturb when volume restricted" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 19:32:49 +0000 (19:32 +0000)]
am
4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
* commit '
4a23ac45895ec65e2357b2e52726229dbead9bb1':
Installer is a part of the system with unrevocable permissions
John Spurlock [Tue, 30 Jun 2015 19:32:45 +0000 (19:32 +0000)]
am
a81c2e16: Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev
* commit '
a81c2e16fa8cd8b9c74332907f277af8aabf2b52':
Volume: Defend against monkeys pulling tags too early.
Bryce Lee [Tue, 30 Jun 2015 19:31:41 +0000 (12:31 -0700)]
Merge commit '
91d2cbf4' into manualmerge
Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158
Svet Ganov [Tue, 30 Jun 2015 19:24:02 +0000 (19:24 +0000)]
Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
John Spurlock [Tue, 30 Jun 2015 19:22:15 +0000 (19:22 +0000)]
Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev
John Spurlock [Tue, 30 Jun 2015 19:14:27 +0000 (15:14 -0400)]
Volume: Defend against monkeys pulling tags too early.
Bug:
22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d
Maxim Bogatov [Tue, 30 Jun 2015 18:53:55 +0000 (18:53 +0000)]
am
7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev
* commit '
7a2e4b8f80de85d11d8bd49e559acd56801ea541':
Let TextView clear accessibility selection index
Maxim Bogatov [Tue, 30 Jun 2015 18:45:46 +0000 (18:45 +0000)]
Merge "Let TextView clear accessibility selection index" into mnc-dev
Bryce Lee [Tue, 30 Jun 2015 18:34:47 +0000 (18:34 +0000)]
am
cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
* commit '
cc2ba2200ddc9d95753fa930aa245540fac880e8':
Only enable theater mode by button press after setup.
David Friedman [Tue, 30 Jun 2015 18:09:42 +0000 (18:09 +0000)]
am
3acd1603: am
eb7f1a94: am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
3acd16032c1f8009f17d04ef6fce8d4211835f24':
Docs: Localized M-Preview pages Bug:
21789313
Andrew Solovay [Tue, 30 Jun 2015 18:09:38 +0000 (18:09 +0000)]
am
8722e141: am
4653cdec: am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
8722e1416ed04fbd0122c394c7fdad9d41524c60':
docs: Clarified when you can put the fragments in the root view.
David Friedman [Tue, 30 Jun 2015 17:57:45 +0000 (17:57 +0000)]
am
eb7f1a94: am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
eb7f1a948a202cec51c0c09c3fbc1c557674380b':
Docs: Localized M-Preview pages Bug:
21789313
Andrew Solovay [Tue, 30 Jun 2015 17:57:36 +0000 (17:57 +0000)]
am
4653cdec: am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
4653cdecab5eb6b08f23183f83034ccf50e93451':
docs: Clarified when you can put the fragments in the root view.
Yorke Lee [Tue, 30 Jun 2015 17:57:12 +0000 (17:57 +0000)]
am
40dff5b4: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
* commit '
40dff5b47f52ffb648f51c395ae67193e3121a2c':
Fix TelecomManager.isVoicemailNumber
Yorke Lee [Tue, 30 Jun 2015 17:47:08 +0000 (17:47 +0000)]
Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
Chris Wren [Tue, 30 Jun 2015 17:30:52 +0000 (17:30 +0000)]
am
392527c4: Merge "add more power manager metrics" into mnc-dev
* commit '
392527c4cc04be275a1d055a76ee83806beb2cb9':
add more power manager metrics
Chris Wren [Tue, 30 Jun 2015 17:20:27 +0000 (17:20 +0000)]
Merge "add more power manager metrics" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 17:15:44 +0000 (10:15 -0700)]
Installer is a part of the system with unrevocable permissions
1. Mark the installer permissions as not revocable.
2. Make the permission result dispatch more robust to handle installer death.
bug:
22012614
Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
Yorke Lee [Tue, 30 Jun 2015 17:07:40 +0000 (10:07 -0700)]
Fix TelecomManager.isVoicemailNumber
Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.
This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.
Bug:
22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
Bryce Lee [Tue, 30 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
Abodunrinwa Toki [Tue, 30 Jun 2015 16:59:52 +0000 (16:59 +0000)]
am
e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
* commit '
e40d7a632668a3813a443195ba8e2146407a0517':
Fix Floating toolbar overflow width.
Abodunrinwa Toki [Tue, 30 Jun 2015 16:59:48 +0000 (16:59 +0000)]
am
685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
* commit '
685a14468eeb730d19a36ac20bda75fe968feddb':
Fix floating toolbar flicker in ExtractEditText mode.
Svet Ganov [Tue, 30 Jun 2015 16:59:43 +0000 (16:59 +0000)]
am
6dc94c54: Merge "Update the stroage icon." into mnc-dev
* commit '
6dc94c5460760fdc0326f0393a2a52ee5dbc2c68':
Update the stroage icon.
Svet Ganov [Tue, 30 Jun 2015 16:59:39 +0000 (16:59 +0000)]
am
b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev
* commit '
b24ff7e03ad0b8ab2be37f4eb4006dc53a7fa4e4':
Add read/write external storage app ops
Abodunrinwa Toki [Tue, 30 Jun 2015 16:56:20 +0000 (16:56 +0000)]
Merge "Fix Floating toolbar overflow width." into mnc-dev
Abodunrinwa Toki [Tue, 30 Jun 2015 16:53:23 +0000 (16:53 +0000)]
Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Update the stroage icon." into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 16:50:15 +0000 (16:50 +0000)]
Merge "Add read/write external storage app ops" into mnc-dev
Filip Gruszczynski [Tue, 30 Jun 2015 15:27:51 +0000 (15:27 +0000)]
am
4954aff5: Merge "resolved conflicts for merge of
e89d821e to mnc-dev" into mnc-dev
* commit '
4954aff536d4fcf163f410fa83fca30dc9fde4ca':
Dump of previous vibrations.
Andres Morales [Tue, 30 Jun 2015 15:27:46 +0000 (15:27 +0000)]
am
3188574c: Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev
* commit '
3188574c14c479a2898e5251b6b01db6be007975':
[LockSettings] adjust legacy patterns to base 0 for unlocking keystore
Filip Gruszczynski [Tue, 30 Jun 2015 15:19:32 +0000 (15:19 +0000)]
Merge "resolved conflicts for merge of
e89d821e to mnc-dev" into mnc-dev
Andres Morales [Tue, 30 Jun 2015 15:19:26 +0000 (15:19 +0000)]
Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:54:48 +0000 (10:54 -0400)]
Don't allow do not disturb when volume restricted
Bug:
21642285
Change-Id: I8e31f809506b48855eb90c67727c026deb120af5
John Spurlock [Tue, 30 Jun 2015 14:33:07 +0000 (14:33 +0000)]
am
eb60c42d: Merge "Volume: Mark inactive sliders as focusable." into mnc-dev
* commit '
eb60c42df2bc5a985dcb2d4ee8e11d56195d19b1':
Volume: Mark inactive sliders as focusable.
George Mount [Tue, 30 Jun 2015 14:33:02 +0000 (14:33 +0000)]
am
0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
* commit '
0303d9ce70db4cbb4b9052fcd567b04e69405318':
Fix FragmentTransaction replace() behavior
John Spurlock [Tue, 30 Jun 2015 14:22:21 +0000 (14:22 +0000)]
Merge "Volume: Mark inactive sliders as focusable." into mnc-dev
George Mount [Tue, 30 Jun 2015 14:21:45 +0000 (14:21 +0000)]
Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
John Spurlock [Tue, 30 Jun 2015 14:17:37 +0000 (10:17 -0400)]
Volume: Mark inactive sliders as focusable.
Enabled but inactive sliders ought to be focusable, just not
focused.
Bug:
22096089
Change-Id: I95cdfc1b1258ca0e4562761031f4ee59bd35e7e3
Chris Wren [Tue, 30 Jun 2015 14:16:37 +0000 (14:16 +0000)]
am
4572cbc9: only count clicks on zen mode selector
* commit '
4572cbc917b62aeece4afcd73713eeabed2a5d92':
only count clicks on zen mode selector
Chris Wren [Mon, 29 Jun 2015 16:02:13 +0000 (12:02 -0400)]
add more power manager metrics
dream start/stop
dream duration
screen timeout setting
Bug:
21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
Chris Wren [Mon, 29 Jun 2015 15:27:18 +0000 (11:27 -0400)]
only count clicks on zen mode selector
We were counting all changes of mode while the panel was visible, including the
first initialization of the selector.
Bug:
21196323
Change-Id: Icf2165056f03507b0b8c6a21ec1f07830c29173a
Kenny Guy [Tue, 30 Jun 2015 13:11:52 +0000 (13:11 +0000)]
am
31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev
* commit '
31659c253e62546c12f17c7f09b7f8df12758371':
Deprecate APIs for admin to create users.
Kenny Guy [Tue, 30 Jun 2015 13:03:29 +0000 (13:03 +0000)]
Merge "Deprecate APIs for admin to create users." into mnc-dev
Paul Jensen [Tue, 30 Jun 2015 11:22:24 +0000 (11:22 +0000)]
am
2b61c6b1: Merge "Don\'t reevaluate disconnected networks" into mnc-dev
* commit '
2b61c6b16b73f3367e859b5d8ffc5da175d02d33':
Don't reevaluate disconnected networks
Paul Jensen [Tue, 30 Jun 2015 11:11:12 +0000 (11:11 +0000)]
Merge "Don't reevaluate disconnected networks" into mnc-dev
Billy Lau [Tue, 30 Jun 2015 09:44:12 +0000 (09:44 +0000)]
am
f62f4c94: Merge "Bug:
21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
* commit '
f62f4c94a36f5c2f7ad3c70316dc585ea3fd721a':
Bug:
21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
Esteban Talavera [Tue, 30 Jun 2015 09:44:08 +0000 (09:44 +0000)]
am
fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
* commit '
fef8cbd6a643a621a97f8e5616977e1fb65d9a5f':
Marking some globals from setGlobalSetting as not supported
Billy Lau [Tue, 30 Jun 2015 09:05:31 +0000 (09:05 +0000)]
Merge "Bug:
21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
Esteban Talavera [Tue, 30 Jun 2015 08:55:35 +0000 (08:55 +0000)]
Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
Benjamin Franz [Tue, 30 Jun 2015 07:48:01 +0000 (07:48 +0000)]
am
01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev
* commit '
01b079f7d2dff0c9230e0f58842a473dc8c2cd06':
Make ContentObservers work across profiles
Dianne Hackborn [Tue, 30 Jun 2015 07:47:57 +0000 (07:47 +0000)]
am
5a6f2136: Merge "Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev
* commit '
5a6f2136777bd8c62b0e5b5b48138a56c789a4a9':
Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager
Benjamin Franz [Tue, 30 Jun 2015 07:45:47 +0000 (07:45 +0000)]
Merge "Make ContentObservers work across profiles" into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 07:41:15 +0000 (07:41 +0000)]
Merge "Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 06:45:45 +0000 (23:45 -0700)]
Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager
Turn off GET_ACCOUNTS permission assigning for now.
Change-Id: I576117b26a43ca2da10db8bb2b1e4e176109ae39
Erik Kline [Tue, 30 Jun 2015 06:46:01 +0000 (06:46 +0000)]
am
5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev
* commit '
5f950417f63718880e0cc14a1a5865106b2fe551':
Fix use of reachable DNS server logic
Erik Kline [Tue, 30 Jun 2015 06:32:19 +0000 (06:32 +0000)]
Merge "Fix use of reachable DNS server logic" into mnc-dev
Andreas Gampe [Tue, 30 Jun 2015 05:47:38 +0000 (05:47 +0000)]
am
6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
* commit '
6feb4301eb8541cbcb5e4dd9312271eddddf4742':
Frameworks/base: Remove UsageEvents finalizer
Andreas Gampe [Tue, 30 Jun 2015 05:40:06 +0000 (05:40 +0000)]
Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 05:15:55 +0000 (22:15 -0700)]
Update the stroage icon.
bug:
22172919
Change-Id: Ie3ff2a7ceb76123462e3f2dcbd44028d976de19b
Andreas Gampe [Tue, 30 Jun 2015 05:07:30 +0000 (22:07 -0700)]
Frameworks/base: Remove UsageEvents finalizer
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.
Bug:
22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
Svet Ganov [Tue, 30 Jun 2015 04:51:41 +0000 (21:51 -0700)]
Add read/write external storage app ops
bug:
22104418
Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
Abodunrinwa Toki [Tue, 30 Jun 2015 04:17:22 +0000 (21:17 -0700)]
Fix Floating toolbar overflow width.
Also clean out unused methods.
Bug:
22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
Svet Ganov [Tue, 30 Jun 2015 03:54:10 +0000 (03:54 +0000)]
Abodunrinwa Toki [Tue, 30 Jun 2015 03:43:14 +0000 (20:43 -0700)]
Fix floating toolbar flicker in ExtractEditText mode.
Fixed by making sure to update visibility immediately after setting a
hide flag on the FloatingToolbarVisibilityHelper.
Bug:
22101632
Change-Id: Iea2d9786c14f6451da836e55f0d880025aa00ed2
Svet Ganov [Tue, 30 Jun 2015 03:19:25 +0000 (20:19 -0700)]
Fix build
Change-Id: I64fc25c9ddd79c31e5bf34ec7bb4e21541be315b
Erik Kline [Fri, 26 Jun 2015 10:21:34 +0000 (19:21 +0900)]
Fix use of reachable DNS server logic
Move reachable DNS server computation out of ConnectivityService
and split it into LinkProperties#isReachable() and a companion
change in WifiStateMachine's makeLinkProperties().
Restore previous ConnectivityService#updateDnses() behaviour, as
the pruning is done in WifiStateMachine now.
Bug:
19470192
Bug:
20733156
Bug:
22098233
Change-Id: I810ef74d504e5dc1ca2017d435cdadd6b82171e6
David Friedman [Tue, 30 Jun 2015 01:58:57 +0000 (01:58 +0000)]
am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654':
Docs: Localized M-Preview pages Bug:
21789313
David Friedman [Tue, 30 Jun 2015 01:51:35 +0000 (01:51 +0000)]
Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
Svetoslav [Tue, 30 Jun 2015 00:54:42 +0000 (00:54 +0000)]
am
03b5f128: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
* commit '
03b5f128dbc375c1a28468773f39e85a5f70fc9a':
Grant default permissons to the default SMS, Phone, Browser app.
Jorim Jaggi [Tue, 30 Jun 2015 00:54:37 +0000 (00:54 +0000)]
am
b98ea66d: Merge "Disable Keyguard chatyness" into mnc-dev
* commit '
b98ea66d353c40810ec10ef48ab638175b0207eb':
Disable Keyguard chatyness
Svetoslav [Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)]
Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
Jorim Jaggi [Tue, 30 Jun 2015 00:47:51 +0000 (00:47 +0000)]
Merge "Disable Keyguard chatyness" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 02:07:31 +0000 (19:07 -0700)]
Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.
bug:
22104986
Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
Jorim Jaggi [Tue, 30 Jun 2015 00:35:52 +0000 (00:35 +0000)]
am
e85da2ba: Add accessibility event for assist disclosure
* commit '
e85da2bad5b80f4e2269a64255cbaf8c11efce61':
Add accessibility event for assist disclosure
Jorim Jaggi [Tue, 30 Jun 2015 00:35:48 +0000 (00:35 +0000)]
am
825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
* commit '
825c2a006ed3fd5f33c4fe8ecf3e682bebd97817':
Add setting to disable screenshot separately (1/2)
Jorim Jaggi [Fri, 26 Jun 2015 00:26:10 +0000 (17:26 -0700)]
Add accessibility event for assist disclosure
Bug:
21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
Jorim Jaggi [Tue, 30 Jun 2015 00:25:46 +0000 (17:25 -0700)]
Disable Keyguard chatyness
Bug:
21320918
Change-Id: I71a52b5a2f27dcf0d81710b16d9d36fc4e73ec04
Dianne Hackborn [Tue, 30 Jun 2015 00:25:34 +0000 (00:25 +0000)]
am
a03b18c6: Merge "Auto grant GET_ACCOUNTS where appropriate." into mnc-dev
* commit '
a03b18c6c2ccf230a58688da7b3df56a548d561b':
Auto grant GET_ACCOUNTS where appropriate.
Jorim Jaggi [Tue, 30 Jun 2015 00:24:34 +0000 (00:24 +0000)]
Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
Jorim Jaggi [Fri, 26 Jun 2015 23:40:00 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (1/2)
Bug:
22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
Dianne Hackborn [Tue, 30 Jun 2015 00:15:07 +0000 (00:15 +0000)]
Merge "Auto grant GET_ACCOUNTS where appropriate." into mnc-dev
Filip Gruszczynski [Tue, 30 Jun 2015 00:07:33 +0000 (17:07 -0700)]
resolved conflicts for merge of
e89d821e to mnc-dev
Change-Id: I3dea6a0947df26b99a779979d68f018d1ad678dc
Christopher Tate [Mon, 29 Jun 2015 23:58:24 +0000 (23:58 +0000)]
am
c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
* commit '
c4c239bfe5e50b7b0cdebfdb64172b4da8198828':
Don't crash in JNI: add DeadObjectException(String msg) ctor
Christopher Tate [Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)]
Merge "Don't crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
Santos Cordon [Mon, 29 Jun 2015 23:45:29 +0000 (23:45 +0000)]
am
bea55afc: Merge "Telecom API council changes." into mnc-dev
* commit '
bea55afc4a5af9564ff175091d5b3b8736f70a7c':
Telecom API council changes.
Tyler Gunn [Mon, 29 Jun 2015 23:45:25 +0000 (23:45 +0000)]
am
f7c5c373: Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev
* commit '
f7c5c373ab08bbd5aade14c4a94c4457558deb95':
IMS: Map pay phone and unknown presentation with OIR.
Santos Cordon [Mon, 29 Jun 2015 23:40:13 +0000 (23:40 +0000)]
Merge "Telecom API council changes." into mnc-dev
Tyler Gunn [Mon, 29 Jun 2015 23:31:33 +0000 (23:31 +0000)]
Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev
Santos Cordon [Thu, 25 Jun 2015 23:41:48 +0000 (16:41 -0700)]
Telecom API council changes.
- adding more javadocs.
- fixing javadoc on isEnabled
- renaming to CONFIGURE_PHONE_ACCOUNT
Bug:
21573551
Change-Id: Ice035b8573a08ea18181a73c9e9a462520a934f1
Christopher Tate [Mon, 29 Jun 2015 22:43:26 +0000 (15:43 -0700)]
Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug
22104446
Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
David Friedman [Mon, 29 Jun 2015 23:03:08 +0000 (16:03 -0700)]
Docs: Localized M-Preview pages
Bug:
21789313
Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
Shriram Ganesh [Thu, 5 Mar 2015 11:13:03 +0000 (16:43 +0530)]
IMS: Map pay phone and unknown presentation with OIR.
Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.
Bug:
22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
Jean-Michel Trivi [Mon, 29 Jun 2015 22:19:43 +0000 (22:19 +0000)]
am
3a0d77f4: Merge "Volume change intent carries stream alias" into mnc-dev
* commit '
3a0d77f42aa8bbc3e3f81bb80a55324fc686e2a7':
Volume change intent carries stream alias
Jean-Michel Trivi [Mon, 29 Jun 2015 22:11:33 +0000 (22:11 +0000)]
Merge "Volume change intent carries stream alias" into mnc-dev
Andrew Solovay [Mon, 29 Jun 2015 21:55:09 +0000 (21:55 +0000)]
am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
350286e613cdde99f347bd115c406e790a242f87':
docs: Clarified when you can put the fragments in the root view.
Andrew Solovay [Mon, 29 Jun 2015 21:42:46 +0000 (21:42 +0000)]
Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
OSDN Git Service
