196345 Commits

Author SHA1 Message Date
Jason Monk
583d2d9ba2 Merge "Don't allow do not disturb when volume restricted" into mnc-dev 2015-06-30 20:08:17 +00:00
Adam Lesinski
43f222f02f BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
2015-06-30 12:54:41 -07:00
Adam Lesinski
f178066925 Add round/notround qualifier to docs
Bug:22203014
Change-Id: Icc05b93f0c1beddce3bd26ae169c2e8c0e3cb898
2015-06-30 12:40:57 -07:00
Bryce Lee
3ae447e8bb Merge commit '91d2cbf4' into manualmerge
Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158
2015-06-30 12:31:41 -07:00
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
John Spurlock
a81c2e16fa Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev 2015-06-30 19:22:16 +00:00
John Spurlock
1a830f0d80 Volume: Defend against monkeys pulling tags too early.
Bug: 22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d
2015-06-30 15:14:27 -04:00
Maxim Bogatov
7a2e4b8f80 Merge "Let TextView clear accessibility selection index" into mnc-dev 2015-06-30 18:45:52 +00:00
Bryce Lee
d903e580aa 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.
2015-06-30 18:34:47 +00:00
Doris Liu
3380e69f55 Resolve CompoundButton's foreground drawable for layout direction change
This CL adds a step to resolve CompoundButton's foreground drawable when
layout direction has been changed. Prior this CL, only background drawable
of the button resolves its layout direciton in respond to system wide
layout direction change. This CL makes the foreground and background
drawables consistent in layout direciton.

Bug: 16376848
Change-Id: I9a4eb1e010e6ab61ef8684005508bd36486ec1f3
2015-06-30 11:26:47 -07:00
David Friedman
3acd16032c 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
2015-06-30 17:57:45 +00:00
Andrew Solovay
8722e1416e 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.
2015-06-30 17:57:36 +00:00
Yorke Lee
40dff5b47f Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev 2015-06-30 17:47:17 +00:00
Chris Wren
392527c4cc Merge "add more power manager metrics" into mnc-dev 2015-06-30 17:20:29 +00:00
Svet Ganov
6a166af8fd 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
2015-06-30 10:15:49 -07:00
Yorke Lee
1249bdbe90 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
2015-06-30 10:15:40 -07:00
Bryce Lee
cc2ba2200d Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev 2015-06-30 17:13:04 +00:00
Miao Wang
6099ee6e08 [RenderScript] update the type of offsets for BLAS.BNNM
bug: 22184114

Change-Id: I7e7132aa3563f32de32640567b381f8f5bddf491
2015-06-30 10:12:54 -07:00
Abodunrinwa Toki
e40d7a6326 Merge "Fix Floating toolbar overflow width." into mnc-dev 2015-06-30 16:56:23 +00:00
Abodunrinwa Toki
685a14468e Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev 2015-06-30 16:53:26 +00:00
Svet Ganov
6dc94c5460 Merge "Update the stroage icon." into mnc-dev 2015-06-30 16:50:58 +00:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
Svet Ganov
06324ed4c6 Do not hold a lock when calling API to grant default permissions
bug:22186491

Change-Id: Id0a468423048938a91598629c4921090ec082853
2015-06-30 09:23:55 -07:00
Filip Gruszczynski
4954aff536 Merge "resolved conflicts for merge of e89d821e to mnc-dev" into mnc-dev 2015-06-30 15:19:37 +00:00
Andres Morales
3188574c14 Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev 2015-06-30 15:19:30 +00:00
Jason Monk
f0a60dd206 Don't allow do not disturb when volume restricted
Bug: 21642285
Change-Id: I8e31f809506b48855eb90c67727c026deb120af5
2015-06-30 10:54:48 -04:00
John Spurlock
eb60c42df2 Merge "Volume: Mark inactive sliders as focusable." into mnc-dev 2015-06-30 14:22:23 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
John Spurlock
c0892c6bd6 Volume: Mark inactive sliders as focusable.
Enabled but inactive sliders ought to be focusable, just not
focused.

Bug: 22096089
Change-Id: I95cdfc1b1258ca0e4562761031f4ee59bd35e7e3
2015-06-30 10:17:37 -04:00
Chris Wren
9bb290bcc3 add more power manager metrics
dream start/stop
dream duration
screen timeout setting

Bug: 21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
2015-06-30 10:10:24 -04:00
Chris Wren
4572cbc917 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
2015-06-30 09:43:41 -04:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Paul Jensen
2b61c6b16b Merge "Don't reevaluate disconnected networks" into mnc-dev 2015-06-30 11:11:14 +00:00
Chris Banes
c8f6ecc265 Fix memory leak in setActionProvider() - framework edition
Caused by ActionMenuItem's SubUiVisibilityListener
not being nulled when it is replaced via setActionProvider().

BUG: 22189734
Change-Id: Id4deaa05cd5554ca7bdf969a592e4812e39dcb75
2015-06-30 11:17:57 +01:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00
Dianne Hackborn
5a6f213677 Merge "Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev 2015-06-30 07:41:17 +00:00
Dianne Hackborn
82143339d4 Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager
Turn off GET_ACCOUNTS permission assigning for now.

Change-Id: I576117b26a43ca2da10db8bb2b1e4e176109ae39
2015-06-29 23:47:32 -07:00
Erik Kline
5f950417f6 Merge "Fix use of reachable DNS server logic" into mnc-dev 2015-06-30 06:32:23 +00:00
Andreas Gampe
6feb4301eb Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 2015-06-30 05:40:08 +00:00
Svet Ganov
1be564adac Update the stroage icon.
bug:22172919

Change-Id: Ie3ff2a7ceb76123462e3f2dcbd44028d976de19b
2015-06-29 22:16:00 -07:00
Andreas Gampe
373fb40947 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
2015-06-29 22:07:30 -07:00
Svet Ganov
921c7dfc80 Add read/write external storage app ops
bug:22104418

Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
2015-06-29 21:51:45 -07:00
Abodunrinwa Toki
8747f37383 Fix Floating toolbar overflow width.
Also clean out unused methods.

Bug: 22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
2015-06-29 21:17:22 -07:00
Abodunrinwa Toki
1b57653b50 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
2015-06-29 20:43:14 -07:00
Svet Ganov
b6e0013768 Fix build
Change-Id: I64fc25c9ddd79c31e5bf34ec7bb4e21541be315b
2015-06-29 20:19:25 -07:00
Erik Kline
b36a3131d1 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
2015-06-30 12:12:37 +09:00
David Friedman
eb7f1a948a am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs
* commit '9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654':
  Docs: Localized M-Preview pages Bug: 21789313
2015-06-30 01:58:57 +00:00
David Friedman
9f2e92eebd Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs 2015-06-30 01:51:37 +00:00