drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,619 Commits 1 Branch 0 Tags
Commit Graph

27210 Commits

Author SHA1 Message Date
Zach Johnson
26b21a6cef am ea9f961c: am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'ea9f961ce22c7d0784506beb608714401b8079e9':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:24:42 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Filip Gruszczynski
d2bc8af5b3 am 3370b6c9: am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev 
* commit '3370b6c95e153c3c665e38f6f9b5d105da2949d7':
  Calculate outsets before window frame adjustment.
 2015-06-08 22:27:17 +00:00
Filip Gruszczynski
5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev 
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
 2015-06-08 15:00:25 -07:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness 
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
 2015-06-08 13:49:13 -07:00
keunyoung
b7145b14d6 am b7ee0ba4: am 7da9d7aa: Merge "apply force hiding of window only when it is main display" into mnc-dev 
* commit 'b7ee0ba43b95fa1462b241ac6e46d1eb853dfa3c':
  apply force hiding of window only when it is main display
 2015-06-08 20:37:32 +00:00
keunyoung
7da9d7aa52 Merge "apply force hiding of window only when it is main display" into mnc-dev 2015-06-08 20:08:49 +00:00
Dianne Hackborn
82aa5f2cf5 am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '09653fc5ee5f2050f61e055d773d0f873c71b6db':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:02:02 +00:00
Mike Lockwood
e89f9d8af7 am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'ac4c704b4ef233f12c649f6e20794dd1aeb28a1d':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:01:57 +00:00
keunyoung
7a542b66e0 apply force hiding of window only when it is main display 
- force hiding window for non-main display leads into stopping
  rendering of windows in non-main display.
- change the logic to skip force hiding if it is not main display.

bug: 21665476

Change-Id: I2e23f3a2d6e3cbf6819ade1798360efe2986e80e
 2015-06-08 12:55:51 -07:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
dcashman
6bd28c0804 am 9a501662: am b5766468: Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 
* commit '9a5016622d8414b71f09ba1407138aa8388a37fa':
  Add SYSTEM_DIR check to upgrade-key-set verification.
 2015-06-08 18:42:40 +00:00
Wale Ogunwale
b75323e20c am 1b5da5d7: am 281dffb7: Merge "Include launched packageName in systrace." into mnc-dev 
* commit '1b5da5d77b875e1cfc769278b17cbca92e7b4879':
  Include launched packageName in systrace.
 2015-06-08 18:22:48 +00:00
Adam Lesinski
2d3b04db58 am 3cc350ea: am ce1590da: Merge "Wait for wakeup_reasons on first init" into mnc-dev 
* commit '3cc350ea7438ca00439a5f640e5600f2c60825f5':
  Wait for wakeup_reasons on first init
 2015-06-08 18:22:42 +00:00
Dimitry Ivanov
c346c393ce am eb748a39: am 25bb4553: Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-dev 
* commit 'eb748a3966ceac695d78c9faee6f20615cd1e812':
  Revert "Print exception stacktrace on failed scanPackageLI"
 2015-06-08 18:22:35 +00:00
dcashman
b576646853 Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev 2015-06-08 18:20:47 +00:00
dcashman
f61ae2de25 Add SYSTEM_DIR check to upgrade-key-set verification. 
Bug: 21697139
Change-Id: I7e6ce3d7f231e0ca5da1f501c80342a04f6c2a1e
 2015-06-08 10:53:20 -07:00
Wale Ogunwale
281dffb76f Merge "Include launched packageName in systrace." into mnc-dev 2015-06-08 17:45:04 +00:00
Adam Lesinski
ce1590dac9 Merge "Wait for wakeup_reasons on first init" into mnc-dev 2015-06-08 17:42:20 +00:00
Wale Ogunwale
e14bd608f7 am 5265fc96: am 7fa228f4: Merge "Release voice wake lock at end of voice interaction session" into mnc-dev 
* commit '5265fc9689fb8b2a6fac25069aa9e5ced233749a':
  Release voice wake lock at end of voice interaction session
 2015-06-08 17:34:38 +00:00
Dimitry Ivanov
25bb4553f3 Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-dev 2015-06-08 17:28:25 +00:00
Wale Ogunwale
a47884b386 am 56651bc4: am aac4c5c2: Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev 
* commit '56651bc459495451cd2069dbc12f990531b1865a':
  Hold service lock when AMS.setProcessMemoryTrimLevel() is called
 2015-06-08 17:14:08 +00:00
Tim Kilbourn
6b3bb7d669 am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '0a08108d753f2d04da046e6d7792ee33ac2af364':
  Pass an args bundle to launchAssistAction.
 2015-06-08 17:14:02 +00:00
Dimitry Ivanov
47fc7fe7f6 Revert "Print exception stacktrace on failed scanPackageLI" 
This reverts commit 95b7d50ce1a1ae879bbb1b8b8262172744c28d0e.

Bug: 8076853
Change-Id: Ia19e6638a97b7b49561932752a204990e3a486d4
 2015-06-08 17:12:55 +00:00
John Spurlock
202dea4125 am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev 
* commit '5e73a085c6788670d1e3bec423f346f60d88c977':
  Zen: New user flow for requesting DND access.
 2015-06-08 17:06:13 +00:00
Mady Mellor
1612c73a8b am b4142e1c: am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 
* commit 'b4142e1c6044a5cb5224ae3f968cb3690d0fbbf7':
  Change stylus button press to context click in View - API review feedback
 2015-06-08 17:05:52 +00:00
Wale Ogunwale
7fa228f4ea Merge "Release voice wake lock at end of voice interaction session" into mnc-dev 2015-06-08 17:05:09 +00:00
Lorenzo Colitti
4566d923c3 am 9c68c7c0: am ef2ccf5f: Merge "Correctly time out CMD_START_DHCP." into mnc-dev 
* commit '9c68c7c0a737e25b1dc7f4341a38502976ca23d2':
  Correctly time out CMD_START_DHCP.
 2015-06-08 17:04:53 +00:00
Lorenzo Colitti
af3125cde8 am 4aba8f26: am dc540ea0: Merge "Delete code that checks for the simulator, it\'s long gone." into mnc-dev 
* commit '4aba8f26cdf585bf630e8e4020f5fc1f5322e841':
  Delete code that checks for the simulator, it's long gone.
 2015-06-08 17:04:26 +00:00
Wale Ogunwale
4a922d4700 Release voice wake lock at end of voice interaction session 
Bug: 21615776
Bug: 21615761
Change-Id: I75d568474d4df5f21ea5b616887c6187e54f69e7
 2015-06-08 09:59:54 -07:00
Wale Ogunwale
aac4c5c28f Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev 2015-06-08 16:50:22 +00:00
Tim Kilbourn
159f558a39 Merge "Pass an args bundle to launchAssistAction." into mnc-dev 2015-06-08 16:46:42 +00:00
Narayan Kamath
7829c81345 Include launched packageName in systrace. 
This makes it easier to tell which package the activity manager is
launching. The downside here is that each launch shows up in a separate
row in the systrace, but this matches up with the "Start proc:" label,
which contains the package name as well and makes it easier to inspect
both simultaneously.

bug: 21632700
Change-Id: I20ebc2f2a2cf0dc74c6d7daa4bafa381ae4c4060
 2015-06-08 17:39:43 +01:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
Wale Ogunwale
e9408f3157 Hold service lock when AMS.setProcessMemoryTrimLevel() is called 
Bug: 21633189
Change-Id: I7203807466593ced6ec3dd328c1a03532caf3a31
 2015-06-08 09:14:37 -07:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access. 
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
 2015-06-08 11:53:35 -04:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Lorenzo Colitti
ef2ccf5f4b Merge "Correctly time out CMD_START_DHCP." into mnc-dev 2015-06-08 12:48:40 +00:00
Lorenzo Colitti
5bc64b847a Correctly time out CMD_START_DHCP. 
WifiStateMachine expects CMD_START_DHCP to time out after 30-40
seconds. Currently, DhcpClient imposes timeouts on DhcpInitState
and on DhcpRequestState, but not on the time it takes to get to
from CMD_START_DHCP to DhcpBoundState. So in theory the client
could oscillate between DhcpInitState and DhcpRequestState and
never time out.

Fix this by introducing a new oneshot timer that is set when DHCP
starts and is cancelled when it succeeds. CMD_RENEW_DHCP does not
need this because it's implemented using only one state, so the
oneshot timeout can be implemented using the state timeout.

Bug: 19704592
Change-Id: I6a5847a3dee23a2692237b8f3b3b0f8049da5140
 2015-06-08 19:57:14 +09:00
Lorenzo Colitti
dc540ea067 Merge "Delete code that checks for the simulator, it's long gone." into mnc-dev 2015-06-08 04:18:40 +00:00
Adam Lesinski
6b0331a030 Wait for wakeup_reasons on first init 
Previously if we were initializing the wakeup callback for the first time,
we would read the wakeup_reason file and ignore the contents, sending a
wakeup_reason of "unknown" up to BatteryStats.

Now we initialize the callback and wait on it immediately. Wakeup reasons are reset
when we go into sleep, so when we wakeup, we will always have fresh wakeup reasons.

Bug:21665793

Change-Id: I20832d8a143fc2715915fcecf4bb71980f279440
 2015-06-05 17:47:07 -07:00
Justin Harrison
94d5ade9ea am 705a35de: am c3b9156e: am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '705a35de3adcd3406687bad66d4bd45f3a6725f8':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:30:10 +00:00
Justin Harrison
01c3750504 am 00fd82c3: am 9445df6f: am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '00fd82c3f773f6e18605daf8f00b62e996e41588':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:30:04 +00:00
Christopher Tate
5cd3a08840 am 8462211c: am 97c699e2: Merge "Don\'t run backups in battery-saver mode" into mnc-dev 
* commit '8462211c9cd27ac425111af7c0e41f8314428937':
  Don't run backups in battery-saver mode
 2015-06-06 00:18:54 +00:00
Justin Harrison
c3b9156e28 am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '6715ef754a72fdc2477257051e539c38aae6afcd':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:06:07 +00:00
Justin Harrison
9445df6f0b am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '95be178dafd0dfefcae060f65df296cb523f82a4':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:06:02 +00:00
Stefan Kuhne
000324423f am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit 'a3590bffa11dabd0721b731f53e0a1ad84caeabc':
  Adding am send-trim-memory command
 2015-06-06 00:00:06 +00:00
Christopher Tate
97c699e2bd Merge "Don't run backups in battery-saver mode" into mnc-dev 2015-06-05 23:50:44 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00