Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,070 Commits 3 Branches 0 Tags
bfe288690a53560f500ada91c13acfc6fd78ccde
Commit Graph

4930 Commits

Author SHA1 Message Date
Winson Chung
7d7ce90db8 am a9b08df9: am dc91eca6: am 45e1153d: am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit 'a9b08df90e3a94e23d45d0d31092ed06157d13d5':
  Adding metrics to overview.
 2015-07-07 03:23:26 +00:00
Winson Chung
a9b08df90e am dc91eca6: am 45e1153d: am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit 'dc91eca6545ae1a9cae1e0336897e26ce313829c':
  Adding metrics to overview.
 2015-07-07 01:17:45 +00:00
Adam Lesinski
f124aeaf53 am ebb92a3c: am 92726ca9: am 1fa6846b: am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit 'ebb92a3c4001e943c68acbd3760cdb14eb091eee':
  BatteryStats: Fix issue with method parameter order...
 2015-07-07 00:31:08 +00:00
Winson Chung
5c9f4b90bf Adding metrics to overview. 
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
 2015-07-06 15:52:21 -07:00
Adam Lesinski
ebb92a3c40 am 92726ca9: am 1fa6846b: am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit '92726ca9cab7c87cfa249482c37451a87f0bfcd2':
  BatteryStats: Fix issue with method parameter order...
 2015-07-06 19:18:14 +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
90bfb06db8 am a9ede6c2: am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native. 
* commit 'a9ede6c261cf9b49eb763d75139966593119a8b8':
  Fix app ops aidl as it is also used from native.
 2015-07-06 12:59:00 +00:00
Narayan Kamath
1e813b1236 am bef809c4: am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework." 
* commit 'bef809c4ba9cbf4654faf2d6c1ebfbc0a38c56fe':
  Delete unused testing scripts and WithFramework.
 2015-07-06 12:58:43 +00:00
Rubin Xu
fd65ba9e2b am 0dfa0e70: am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev 
* commit '0dfa0e70c710d21c166a6dae6a7c8f9ec4427f88':
  Remove ExternalMediaFormatActivity
 2015-07-06 12:57:55 +00:00
Svet Ganov
a9ede6c261 am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native. 
* commit 'e7cd90012d985b35bb1c93320b8e4afbf94e5f29':
  Fix app ops aidl as it is also used from native.
 2015-07-05 18:43:21 +00:00
Nicolas Prevot
92ebe9a289 am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev 
* commit 'b06aece751cc86aa859005bbb8843c5ed6be7c6f':
  Fix the case where an intent bounces several times between users.
 2015-07-04 08:06:54 +00:00
Svet Ganov
e8ce8368fc am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
  Teach receivers, activities, providers, and services app ops.
 2015-07-04 07:28:18 +00:00
Dianne Hackborn
19b16eb453 am b857216f: am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 
* commit 'b857216f75bf18e702ead1e201cbbbc36fba39c6':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
 2015-07-04 07:27:38 +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
Chris Wren
9fa3c56486 am 0002b3ba: am f1cc651b: am c58d1695: Merge changes from topic \'tron\' into mnc-dev 
* commit '0002b3bab2e96c3c54b286cbea6bada14c6a91ae':
  remove double count of panel open
  report notification load on panel reveal
 2015-07-03 05:36:06 +00:00
Chris Banes
a55bbdd6b1 am a50db6c6: am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 
* commit 'a50db6c626f9f2ecc1e5c731e2f76fcd51fd0f4b':
  Fix memory leak in setActionProvider() - framework edition
 2015-07-03 05:35:10 +00: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
Adam Lesinski
9d7204a987 BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime 
Bug:22225706

Change-Id: I4c7d889716345231564c1e96494dc84aab17cf01
(cherry picked from commit 43ae441ad7)
 2015-07-02 00:06:19 +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
Adam Lesinski
43ae441ad7 BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime 
Bug:22225706
Change-Id: I4c7d889716345231564c1e96494dc84aab17cf01
 2015-07-01 12:09:45 -07:00
Chris Wren
0002b3bab2 am f1cc651b: am c58d1695: Merge changes from topic \'tron\' into mnc-dev 
* commit 'f1cc651bf5013e63ad05af38be0c0c4888ea7d80':
  remove double count of panel open
  report notification load on panel reveal
 2015-07-01 17:12:19 +00:00
Chris Banes
a50db6c626 am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 
* commit 'c9812040941dad43ca0892bd4dd5e8cf9a219f07':
  Fix memory leak in setActionProvider() - framework edition
 2015-07-01 17:11:40 +00:00
Nicolas Prevot
107f7b7bec Fix the case where an intent bounces several times between users. 
An intent may bounce several times between users.
In this case, we want mContentUserHint to refer to the original
user.

BUG:19656340
Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed
 2015-07-01 17:05:18 +01:00
Chris Wren
c58d169530 Merge changes from topic 'tron' into mnc-dev 
* changes:
  remove double count of panel open
  report notification load on panel reveal
 2015-07-01 15:33:32 +00:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Adam Lesinski
77fa075e6d am 57a32403: am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 
* commit '57a324033bcb348a9c0d4d4774f7d5ebb4b56a41':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
 2015-07-01 01:20:31 +00:00
Adam Lesinski
57a324033b am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 
* commit '4718afcd2e5d52638ba1c4f58b2db6aea01171de':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
 2015-07-01 01:06:31 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Alan Viverette
72fca2ae9f am 78022801: am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 
* commit '7802280162439c2205a09f61cd6d1a5bfa752d96':
  Use non-greedy view to draw background in landscape time picker
 2015-06-30 23:20:47 +00:00
Alan Viverette
7802280162 am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 
* commit '29690e2015748b367b4794b25a7bd34c0c03a1cb':
  Use non-greedy view to draw background in landscape time picker
 2015-06-30 23:05:32 +00:00
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker 
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
 2015-06-30 15:29:13 -07:00
Adam Lesinski
873bf2c48f am 9986350d: am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 
* commit '9986350d66b6106cabe8c017455561f52a727f2c':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
 2015-06-30 21:54:33 +00:00
Adam Lesinski
9986350d66 am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 
* commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
 2015-06-30 21:40:24 +00: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
Chris Wren
b659c4f44a report notification load on panel reveal 
Counts may differ from user perception. For example, if notifications arrive
after the shade is open (even if it is only peeking) there will not be another
panel_reveal before the user sees the shade.  User perception is more accurately
measured by visibility events.

Peek events will report the notificaiton load as 1.

Bug: 20088581
Change-Id: I10221d4b66a18c223aae21e616615f087c65b1e1
 2015-06-30 15:30:22 -04:00
Chris Wren
dd06e383ec am 8cc9473f: am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev 
* commit '8cc9473fff87c184068a3b773c45d1d4c6669fcc':
  add more power manager metrics
 2015-06-30 17:57:14 +00:00
Chris Wren
8cc9473fff am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev 
* commit '699d2f787a8e9fbfcb819f2fb2aaba4c4eb48440':
  add more power manager metrics
 2015-06-30 17:43:13 +00:00