Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,325 Commits 3 Branches 0 Tags
e1fcced61ae81a07ca8c93d8a14dd4eb5b6e36ff
Commit Graph

52026 Commits

Author SHA1 Message Date
Roozbeh Pournader
e1fcced61a Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev 2015-05-16 18:52:30 +00:00
Roozbeh Pournader
f156cb31c0 Make unicodeWrap() return null if the input string is null. 
Previously, a NullPointerException was raised if the input was null.

Bug: 12894042
Change-Id: I5c5db484e5659659c1da91079adcba773ba7d83d
 2015-05-16 18:50:18 +00:00
Dan Sandler
f6351ece20 Merge "Mmm mmm mmm mmm." into mnc-dev 2015-05-16 03:11:53 +00:00
Adam Lesinski
18f84162fe Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev 2015-05-15 22:57:02 +00:00
Adam Lesinski
719e61fa5f BatteryStats: Enable bluetooth energy collection 
Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
 2015-05-15 15:49:24 -07:00
Zach Johnson
a80282a733 Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev 2015-05-15 22:40:35 +00:00
Paul Mclean
0844dcd070 Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev 2015-05-15 22:28:31 +00:00
Paul Mclean
788854b8c0 Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" 
This reverts commit 34f5e04290.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
 2015-05-15 22:28:07 +00:00
Alan Viverette
1ac88088ad Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev 2015-05-15 22:25:41 +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
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
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
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
Alan Viverette
2a576d9ec1 Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev 2015-05-15 20:11:20 +00:00
Dan Sandler
696f6a3c48 Mmm mmm mmm mmm. 
Change-Id: I23b560694b9cc0eb2103ec16769b0446099d1e83
 2015-05-15 16:10:22 -04: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
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
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
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
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
Zhijun He
99dc89961f Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev 2015-05-15 16:03:31 +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
Dan Sandler
d63f9321e6 Icon support comes to Notification. 
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
 2015-05-15 12:35:21 +00:00
Christopher Tate
abcbf05c98 Merge "fullBackupContent isn't public API" into mnc-dev 2015-05-15 01:50:39 +00:00
Ruben Brunk
096c11dc37 Merge "camera2: Fix work-profile eviction handling." into mnc-dev 2015-05-15 01:45:19 +00:00
Ruben Brunk
7f75da2405 camera2: Fix work-profile eviction handling. 
Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
 2015-05-14 18:39:50 -07:00
Alan Viverette
50210d9129 Adjust light source for window position 
Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
 2015-05-14 18:05:36 -07:00
Tor Norbye
2d49752ee0 Add bluetooth permission annotations 
Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
 2015-05-15 00:18:28 +00:00
John Reck
0e4a2b5ff0 Merge "Check for setting to already set" into mnc-dev 2015-05-14 23:27:49 +00:00
John Reck
6d8371e73f Check for setting to already set 
Bug: 20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
 2015-05-14 16:06:12 -07:00
Zhijun He
527d522f34 Camera2: get ride of sceneModeOverrides in API doc 
sceneModeOverrides isn't public API.

Bug: 20152738
Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
 2015-05-14 15:36:04 -07:00
Christopher Tate
474bb82fd5 Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev 2015-05-14 22:16:33 +00:00
Yin-Chia Yeh
a0807a65e9 Merge "Camera: tonemap linkify update" into mnc-dev 2015-05-14 22:12:43 +00:00
Zach Johnson
cdaaa91f7c Create unified BIND_CARRIER_SERVICES permission 
Replace BIND_CARRIER_MESSAGING_SERVICE and
BIND_CARRIER_CONFIG_SERVICE since we don't really
need one permission for each carrier service type.

Deprecate BIND_CARRIER_MESSAGING_SERVICE since it
already shipped, but remove BIND_CARRIER_CONFIG_SERVICE
since it hasn't.

b/21165906

Change-Id: I716f3f1c98a228afcfee84cf4a48911f0736ce8c
 2015-05-14 15:10:39 -07:00
Christopher Tate
98fa656f16 fullBackupContent isn't public API 
Bug 21090205

Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
 2015-05-14 15:01:45 -07:00