Commit Graph

4751 Commits

Author SHA1 Message Date
Adam Lesinski
493244d35c am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
* commit '92a3914fb353b725646a96185d1c1daaf3977e7b':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
2015-07-14 20:22:33 +00:00
Adam Lesinski
92a3914fb3 Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev 2015-07-14 20:08:43 +00:00
Adam Lesinski
67eea87e0d BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
High cpu times are expected as multiple cores can be running at the
same time, so comparing against the time between samples is incorrect.

I am reasonable certain that the values we see now are correct, so disabling this
check. However, checking for negative values (overflows) is still enabled and
will remain enabled because there is no case where we will be ok with negative deltas.

Bug:22461683
Change-Id: If9c7cdbb75ceaed059d1e0f4dd83cfdd3e021a93
2015-07-14 11:33:53 -07:00
Yohei Yukawa
fc5ffc4c18 am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '12952c79528cd7ea804c400e5908a24e56f69bbe':
  Allow FloatingToolbar to be outside of the attached window.
2015-07-14 15:44:37 +00:00
Yohei Yukawa
bafc908304 Allow FloatingToolbar to be outside of the attached window.
Currently PopupWindow used for the floating toolbar specifies
neither FLAG_LAYOUT_NO_LIMITS nor FLAG_LAYOUT_IN_SCREEN.
As a result, the floating toolbar can overlap the selected
text when the attached window does not have enough height.

Here is the repro code.

    final TextView textView = new TextView(this);
    textView.setLayoutParams(
            new ViewGroup.LayoutParams(
                    ViewGroup.LayoutParams.MATCH_PARENT,
                    ViewGroup.LayoutParams.WRAP_CONTENT));
    textView.setText("A test sentence.");
    textView.setTextIsSelectable(true);
    final AlertDialog dialog = new AlertDialog.Builder(this)
            .setView(textView)
            .create();
    dialog.getWindow().setGravity(Gravity.BOTTOM)
    dialog.show();

If you tap a word in the dialog, the floating toolbar
unintentionally overlaps the selected text due to the limited
height of the AlertDialog.

It also turns out that just calling
  PopupWindow.setClippingEnabled(false)
to specify FLAG_LAYOUT_NO_LIMITS is not sufficient and ends up
showing the toolbar on the NavBar because we have mistakenly
compared bounds in window-local coordinates
(e.g. FloatingActionModemContentRectOnWindow) with bounds in
screen coordinates (e.g. FloatingActionMode#mScreenRect).
Hence the confusion of window-local coordinates and screen
coordinates in FloatingToolbar and FloatingToolbar also needs
to be addresses.

To summarize here are the notable changes in this CL:
  - Specify FLAG_LAYOUT_NO_LIMITS so that the floating
    toolbar can be placed outside of the attached window.
    (We do this with PopupWindow#setClippingEnabled)
  - Switch to use screen coordinates from window-local
    coordiantes in FloatingToolbar and FloatingActionMode
    because some system components such as WindowManager
    prefer screen coordinates.
  - Put -OnScreen suffix for Rect and Point variables
    as long as they are in screen coordinates.

Bug: 22335001
Change-Id: I71a8d356e868dc7715b030ca1078da4ec39368c3
2015-07-14 05:59:05 -07:00
Chris Wren
70811001a3 am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563':
  fix build by restoring deleted enum
2015-07-13 17:53:08 +00:00
Chris Wren
8cba70fb05 fix build by restoring deleted enum
Bug: 21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
2015-07-13 12:59:01 -04:00
Chris Wren
83e5a72b67 am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
  add new enums to MetricsConstans
2015-07-13 16:32:25 +00:00
Chris Wren
4502bfb8fd Merge "add new enums to MetricsConstans" into mnc-dev 2015-07-13 16:21:24 +00:00
Rubin Xu
87ea7e2fb6 am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
  Remove ExternalStorageFormatter
2015-07-13 14:06:04 +00:00
Rubin Xu
cf9aebf138 Merge "Remove ExternalStorageFormatter" into mnc-dev 2015-07-13 13:55:53 +00:00
Chris Wren
05aa88a937 add new enums to MetricsConstans
Bug: 21114836
Change-Id: Id62701be012c10bc11ee1ff8aa8435e178d35684
2015-07-10 17:33:39 -04:00
Rubin Xu
cb746a860c Remove ExternalStorageFormatter
Bug: 9433509
Change-Id: I815770e0e0314fc7012ebc213f2167a13d6f37d1
2015-07-09 21:39:01 +01:00
Jorim Jaggi
736249d1bc am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4':
  Fix assist for hardware long-press
2015-07-09 19:32:50 +00:00
Jorim Jaggi
3cc5c24b83 Merge "Fix assist for hardware long-press" into mnc-dev 2015-07-09 19:19:05 +00:00
Adam Lesinski
0d5c30d9ba am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:31:21 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
2015-07-08 17:35:42 -07:00
Jorim Jaggi
165ce066b7 Fix assist for hardware long-press
Activating the assistant will now route through SysUI, so
we have the logic whether to start an activity or to start a voice
interaction session in one single place.

Bug: 22201770
Change-Id: I0f4699533aea2a1e595ee25a844434c82f548c01
2015-07-08 22:26:24 +00:00
Adam Powell
c4e29c06ae am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev
* commit 'e9cbf41561e4b4ac605b075d3d2531aef32dd32d':
  Sort and limit ChooserActivity targets from ChooserTargetServices
2015-07-07 22:08:33 +00:00
Adam Powell
e9cbf41561 Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 2015-07-07 21:55:45 +00:00
Dongwon Kang
eeb3b02530 am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
* commit '0c58229306f30e26d4b0ddb3d332def9b7382480':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
2015-07-07 20:27:45 +00:00
Dongwon Kang
0c58229306 Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 2015-07-07 20:22:40 +00:00
Abodunrinwa Toki
fb84536d23 am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev
* commit '4603bd34ce8a5557729e3912a081ec9f8c0d7ab5':
  FloatingToolbar: Offset visible rect by the rootview's offset
2015-07-07 16:17:00 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Dongwon Kang
7980d10d7c Revert "Use AlertDialog for MediaRouteControllerDialog"
This reverts commit 001d51496d.

Background: To just inherit AlertDialog, the content view should include
a title as we do in support library (AlertDialog uses NO_TITLE feature),
but up-streaming support library implementation to the framework at this
point might cause more issues. Verified that the narrow dialog issue
(b/22044600) does not happen in the framework implementation regardless of
whether it uses AlertDialog or not.

Bug: 22286869
Change-Id: Ic2554cc9e683beff29d1deee91945c1dace83ab1
2015-07-06 20:09:03 -07:00
Adam Powell
a182e45c68 Sort and limit ChooserActivity targets from ChooserTargetServices
Apply an automated decay factor if apps decide to claim all of their
targets are SUPER IMPORTANT. Apply the multiplier from the apps
themselves as well as a penalty for apps that come in late - let's see
how fast developers get their ChooserTargetServices to start!

Also fix a bug with ResolverDrawerLayout where dragging from the title
area wouldn't always work properly.

Bug 22302285

Change-Id: Ib6eb2b6fb92608790b2267c0f671c9ae59b2907e
2015-07-06 18:39:34 -07:00
Adam Lesinski
e72e526c3d am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
* commit 'fe45b29a1cce45b47f648cbff2b7d65890f1d638':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
2015-07-07 00:46:44 +00:00
Adam Lesinski
fe45b29a1c Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 2015-07-07 00:32:24 +00:00
Winson Chung
ddcb64afae am 2924dc34: Merge "Adding metrics to overview." into mnc-dev
* commit '2924dc346654a22f72575eb8ae3ce2e714818bd2':
  Adding metrics to overview.
2015-07-07 00:32:12 +00:00
Winson Chung
5c9f4b90bf Adding metrics to overview.
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
2015-07-06 15:52:21 -07:00
Adam Lesinski
61db88fc8b BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
2015-07-06 15:36:46 -07:00
Adam Lesinski
635cb1eeb1 am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev
* commit '1a257545b2d1e8bd95393ee6637e70be7d230bc6':
  BatteryStats: Fix issue with method parameter order...
2015-07-06 18:12:35 +00:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order...
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
2015-07-06 10:17:24 -07:00
Svet Ganov
40e95ba4a5 am 85be0c4e: Fix app ops aidl as it is also used from native.
* commit '85be0c4e21ba6a2b74a8546403c6da03a343e5aa':
  Fix app ops aidl as it is also used from native.
2015-07-05 16:49:27 +00:00
Narayan Kamath
bef809c4ba am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
  Delete unused testing scripts and WithFramework.
2015-07-04 02:57:58 +00:00
Svet Ganov
85be0c4e21 Fix app ops aidl as it is also used from native.
bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6
2015-07-03 16:23:19 -07:00
Rubin Xu
0dfa0e70c7 am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
* commit '27f13d125f9eb8053493086871fcb5470c786264':
  Remove ExternalMediaFormatActivity
2015-07-02 16:46:57 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
2015-07-02 16:53:57 +01:00
Nicolas Prevot
b06aece751 am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
  Fix the case where an intent bounces several times between users.
2015-07-02 10:52:25 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
2015-07-02 11:41:52 +01:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Svet Ganov
55cd6f44fd am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
  Teach receivers, activities, providers, and services app ops.
2015-07-02 01:02:04 +00:00
Dianne Hackborn
b857216f75 am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev
* commit 'ab33137d68fdb5615d9c6624276d648a0651b953':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
2015-07-02 01:01:27 +00:00
Adam Lesinski
f6fb8d83bd am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev
* commit '499ddbaa790fc6503cd24c64f8fd57dba098b7d2':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
2015-07-02 01:00:09 +00:00
Svet Ganov
68ffcf883c Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 2015-07-01 23:59:21 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops.
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
2015-07-01 16:20:00 -07:00
Dianne Hackborn
6cc53743f5 Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 2015-07-01 22:31:18 +00:00
Dianne Hackborn
4e88bcd399 Fix issue #20672970: Notifications are not dismissed on hot word detection
Add new VoiceInteractionSession.closeSystemDialogs() API that closes
everything except the session itself.

Change-Id: If45f1e120d8ca095b6c8055b6485acb5e710820e
2015-07-01 13:41:03 -07:00