192302 Commits

Author SHA1 Message Date
Alan Viverette
1ac88088ad Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev 2015-05-15 22:25:41 +00:00
Alan Viverette
6044798ef7 Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev 2015-05-15 22:25:26 +00:00
Paul Lawrence
21c8a49306 Merge "DOn't save encryption settings when not encrypted" into mnc-dev 2015-05-15 22:22:25 +00:00
Adam Lesinski
ce27996c4f Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev 2015-05-15 22:18:59 +00:00
Adam Lesinski
ee36c2861a BatteryStatsHelper: Bluetooth wasn't being included in usage list
Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
2015-05-15 15:18:06 -07:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Paul McLean
8c501a3a56 Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev 2015-05-15 22:09:15 +00:00
Paul McLean
34f5e04290 Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c
2015-05-15 14:58:30 -07:00
Jeff Sharkey
2177ed407b Merge changes from topic 'bench' into mnc-dev
* changes:
  Command to change force adoptable state.
  Initial pass at storage benchmarks.
2015-05-15 21:55:57 +00:00
Alan Viverette
e922f49b62 Allow getChangingConfigurations() on DrawableWrapper with null drawable
Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
2015-05-15 14:53:03 -07:00
Adam Lesinski
038959e851 Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 2015-05-15 21:25:00 +00:00
Adam Lesinski
b99e6d69c3 Merge "Parse uid_cputime proc file" into mnc-dev 2015-05-15 21:23:09 +00:00
Alan Viverette
bd51b4d0b9 Return correct year in DayPickerPagerAdapter.getYearForPosition()
Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.

Bug: 21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5
2015-05-15 14:18:44 -07:00
Jeff Sharkey
4c099d0c49 Command to change force adoptable state.
Since user builds can't setprop, add an explicit "sm" verb to change
the force adoptable state.

Bug: 21191915
Change-Id: I719d9b18c1a98c97442a5ddb1cc5512e8e4d3d3f
2015-05-15 14:15:35 -07:00
Adam Powell
6d54f81a9e Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev 2015-05-15 21:01:17 +00:00
Adam Powell
c9f2293471 Preserve ResolverDrawerLayout fully collapsed state across relayout
Fix a bug where a relayout that grows the size of ResolverDrawerLayout
content would cause it to get stuck in a half-collapsed state. This
could also lead to janky touch interaction behavior in
onStopNestedScroll as it animates to the fully open/closed state after
clicking in a descendant list.

Bug 21202727

Change-Id: I5f0a8b19fc079c57fcf2be7c6fa7627b1cb12a3c
2015-05-15 13:59:40 -07:00
David Christie
f02c7d4391 Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev 2015-05-15 20:50:55 +00:00
Jeff Sharkey
9756d75ec2 Initial pass at storage benchmarks.
Offer an interface for Settings to invoke benchmarks on various
attached volumes.

Bug: 21172095
Change-Id: I847ddc87c58285457d1324be87f70ce10507accb
2015-05-15 13:47:12 -07:00
Wale Ogunwale
4f9fd626d3 Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev 2015-05-15 20:35:40 +00:00
Olawale Ogunwale
358d12a06c Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev 2015-05-15 20:34:19 +00:00
Olawale Ogunwale
27d8629534 Merge "Also restart provider if there is external handle." into mnc-dev 2015-05-15 20:33:48 +00:00
Wale Ogunwale
ca1c12581a Clean-up broadcast receivers when component is disabled.
Bug: 15804187
Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317
2015-05-15 13:33:16 -07:00
David Christie
38feb6f1ec Fix issue where GeofenceHardwareImpl can crash.
-It can't be instantiated before looper thread
 is ready.
Bug: 21185178

Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d
2015-05-15 13:23:08 -07:00
Alan Viverette
2a576d9ec1 Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev 2015-05-15 20:11:20 +00:00
Chad Brubaker
206df8c5e5 Merge "Fix testAuthNeeded test" into mnc-dev 2015-05-15 19:37:26 +00:00
Selim Gurun
afabc21722 Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev 2015-05-15 18:47:45 +00:00
Alan Viverette
2cc4a4755f Merge "Adjust light source for window position" into mnc-dev 2015-05-15 18:31:54 +00:00
Alan Viverette
a7ea65e239 Invalidate old accessibility bounds on CONTENT_CHANGE
Bug: 20950124
Change-Id: Id19924358b538f9b7754de3a0c019433817dc1fc
2015-05-15 11:30:21 -07:00
Chad Brubaker
7a882b5d8d Fix testAuthNeeded test
begin now returns OP_AUTH_REQUIRED for per operations with per op
authorization instead of NO_ERROR.

(cherry-picked from commit b0addbaaf22b14200db602c41a5bd86847bdc0a9)

Change-Id: I1f472125f46155833e03ab30bf18363ff51b2c58
2015-05-15 11:27:23 -07:00
Paul Lawrence
688af6c574 DOn't save encryption settings when not encrypted
If this setting is saved when unencrypted, it will apply after encryption
and cause the user to get the wrong default in the 'Require pattern to start
device' dialog.

Bug: 21105662
Change-Id: Ibd2918abb6af27e20dc03a1a10f4cad1033bc575
2015-05-15 11:26:17 -07:00
Alex Klyubin
6a5f85080e Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev 2015-05-15 18:23:01 +00:00
Alex Klyubin
96481c3ddc Remove "encrypt at rest" flag from new AndroidKeyStore API.
This flag causes issues such as being unable to generate, import, or
use keys when the user/profile secure lock screen credential hasn't
yet been entered after boot.

Bug: 18088752
Change-Id: I992f6dfdc945bcb83e341356a40dfa7d7bc143d8
2015-05-15 11:07:42 -07:00
Selim Gurun
26de90aa2e Rename PostMessageToMainFrame to PostWebMessage
Bug: 20557074

There is no need to keep the name PostMessageToMainFrame since
we may choose to not implement the special condition to posting
to a named subframe. And if we want, we can do this by overloading
the function.

Change-Id: I9896ad479e1c30cda500352cfdb1b7d336383568
2015-05-15 11:02:45 -07:00
Mady Mellor
21417a0d50 Merge "Text selection: Fix moving by character when should move by word" into mnc-dev 2015-05-15 17:56:59 +00:00
Mady Mellor
c25d6c22bb Merge "Fix difficulty grabbing handles for small selections" into mnc-dev 2015-05-15 17:56:57 +00:00
Yohei Yukawa
79d0c080a0 Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev 2015-05-15 17:40:44 +00:00
Yohei Yukawa
6640d21b2e Revert "Fix IMMS#mInputShown state inconsistency."
This reverts commit 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd.

Because of a regression Bug 21161785.

Bug: 21161785
Bug: 18722991
Bug: 20763994
Bug: 20764441
Bug: 20926844
Change-Id: If58612eda08764be0226832c0a73f03683889cdb
2015-05-15 17:36:53 +00:00
riddle_hsu
5ff8ba7ace Fix lost singleton provider after force-stopping user or package.
Case 1 (name == null):
Switch user from guest to owner. All processes of guest
will be killed, it will not include processes which singleton
components live in, but singleton provider records are still
collected and removed.

When the user switch is complete and the process of removed
singleton provider is still alive, there is someone access
the provider, it will create a new ContentProviderRecord and
wait but no one will notify it because the provider process
is alive with different ContentProviderRecord.

Then the access cannot get response unless the process of target
provider is died and restarted.

Case 2 (name != null):
Switch to another non-guest user, launch an application which
contains singleton provider. Go to Settings to force-stop the
package then switch back to owner user. Launch an application
which will access the singleton provider. It will also cannot
get response that similar as case 1.

Solution:
Only collect singleton provider if target user is all or owner.

Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516
2015-05-15 10:17:21 -07:00
Dirk Dougherty
b3fa8bf221 am 7414f97a: am efd254b2: Doc change: fix urls, remove obsolete image.
* commit '7414f97a04658858201760c3a60a9d8fa95042fa':
  Doc change: fix urls, remove obsolete image.
2015-05-15 16:46:24 +00:00
Dirk Dougherty
c259daacde am 3519ddfe: am de401c82: Doc change: More changes to distribute files, Google Services page update.
* commit '3519ddfe07de5847332937c4a0ba29c0378fe26a':
  Doc change: More changes to distribute files, Google Services page update.
2015-05-15 16:46:18 +00:00
Alan Viverette
617da41e8c Merge "Update button visibility as a final step in DayPickerView construction" into mnc-dev 2015-05-15 16:44:23 +00:00
Alan Viverette
b47cea9ba1 Merge "Revert "Strip PNG metadata"" into mnc-dev 2015-05-15 16:43:02 +00:00
Alan Viverette
3b0f421685 Revert "Strip PNG metadata"
Removing the color profiles significantly changed the
appearance of some assets.

This reverts commit fe1ca2c535816bf7528b8b77fb5c24f9db324671.

Change-Id: I60d9b645eda927b0fc5adc8b2bd0902fb536208a
2015-05-15 16:41:26 +00:00
Svet Ganov
4e76ee07f7 Merge "Fix easter egg setting validator to accept valid values" into mnc-dev 2015-05-15 16:34:54 +00:00
Svet Ganov
b1918a0568 Fix easter egg setting validator to accept valid values
bug:21188928

Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32
2015-05-15 09:33:00 -07:00
riddle_hsu
dbb902d4ad Also restart provider if there is external handle.
e.g. ContentResolver.getType will call
ActivityManagerService.getProviderMimeType
that will not have connection but increase
externalProcessNoHandleCount.

Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c
2015-05-15 09:20:39 -07:00
Zhijun He
99dc89961f Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev 2015-05-15 16:03:31 +00:00
Paul McLean
0c72f4f9d0 Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev 2015-05-15 14:35:50 +00:00
Tor Norbye
f02fd46d34 Merge "Add bluetooth permission annotations" into mnc-dev 2015-05-15 14:21:16 +00:00
George Mount
b1f1293355 Merge "Remove hidden/deleted APIs." into mnc-dev 2015-05-15 14:08:19 +00:00