Commit Graph

53233 Commits

Author SHA1 Message Date
Doris Liu
e08f3b3ff5 Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev 2015-06-30 21:42:43 +00:00
Doris Liu
99aa13ec10 Merge "Allow null child view when checking whether divider should draw" into mnc-dev 2015-06-30 21:35:09 +00:00
Chris Craik
ca985b54c8 Merge "Don't display layout bounds of GONE views" into mnc-dev 2015-06-30 21:22:26 +00:00
Doris Liu
f102d4266b Allow null child view when checking whether divider should draw
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.

Bug: 22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
2015-06-30 13:57:28 -07:00
Alan Viverette
b35e866713 Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 2015-06-30 20:53:31 +00:00
Chris Craik
a1dab8bb0f Don't display layout bounds of GONE views
bug:22126532

Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
2015-06-30 13:51:26 -07:00
Alan Viverette
6ef129e09d Handle null argument in ImageView.setImageIcon()
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.

Bug: 21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
2015-06-30 13:32:27 -07:00
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +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
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
Maxim Bogatov
7a2e4b8f80 Merge "Let TextView clear accessibility selection index" into mnc-dev 2015-06-30 18:45:52 +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
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
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
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00: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
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00: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
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
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
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
Svetoslav
03b5f128db Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev 2015-06-30 00:49:16 +00:00
Svetoslav
cdfd230a39 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
2015-06-29 17:44:19 -07:00
Jorim Jaggi
e85da2bad5 Add accessibility event for assist disclosure
Bug: 21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
2015-06-30 00:27:14 +00:00
Jorim Jaggi
825c2a006e Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev 2015-06-30 00:24:38 +00:00
Jorim Jaggi
a133f0b522 Add setting to disable screenshot separately (1/2)
Bug: 22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
2015-06-29 17:16:33 -07:00
Christopher Tate
e56db0e3fa Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug 22104446

Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
2015-06-29 16:04:57 -07:00
Yohei Yukawa
4daf600ee0 Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 2015-06-29 20:42:54 +00:00
Eddie Ringle
22369d519d Fix FragmentTransaction replace() behavior
Bug 22174959

According to FragmentTransaction's reference, replace()
should be equivalent to remove()'ing every fragment in
a given container and then adding the specified fragment
to replace those that were removed.

Commit ee76efb74b broke
this intended behavior in the framework.

This patch makes it so that the removal loop doesn't
end prematurely. It also fixes an issue where the
replace operation would remove fragments regardless
of their container after encountering the first fragment
with a matching container ID.

Relevant issues:
http://b.android.com/43265
http://b.android.com/52112
http://b.android.com/53393
http://b.android.com/68856
http://b.android.com/70803

Change-Id: Ica4691746ab8979ed974a998e85324e4feacc5e3
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
2015-06-29 13:13:01 -07:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Esteban Talavera
656fa7f5d1 Marking some globals from setGlobalSetting as not supported
Those globals don't have the intended behaviour any more.

Bug: 19967818
Change-Id: I8c7891e59280f9deb88b1f0ffead3de07f4eca56
2015-06-29 17:41:39 +01:00
Benjamin Franz
adea1918be Make ContentObservers work across profiles
Currently registering for changes to a cross-user Uri does not work, as
the calling user id is used to identify the Uri. Change this to use the
userId the Uri is associated with. In order to protect Uris across
users, we only allow registration for a Uri when the caller has read
permission. We also only allow notify calls from across users when the
caller has write permission to the Uri.

Bug: 19312280
Change-Id: Ide216b09980ed5ebefe9b37c946dd8160167809f
2015-06-29 16:17:55 +01:00
Kenny Guy
14f48e5a93 Deprecate APIs for admin to create users.
Bug: 21921868
Change-Id: I0a59c85f6a87928de3df72278d4b65355ff7270f
2015-06-29 15:11:25 +00:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users."
This reverts commit ea864c4d4d.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Niels Egberts
1ea7a81931 Merge "Fix crash with engines that don't override getVoices()." into mnc-dev 2015-06-29 09:34:44 +00:00