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

26990 Commits

Author SHA1 Message Date
Christopher Tate
ebee48fc57 am 9b564b91: am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling 
* commit '9b564b913234021d87df26f104b7617e62503377':
  Adjust key/value backup scheduling
 2015-06-01 17:24:40 +00:00
Jeff Brown
4363875b8f am 19d50b8f: am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 
* commit '19d50b8f796df8e547b6c72662ab6086971b480e':
  Tell PhoneWindowManager when we start/finish interactive changes.
 2015-06-01 17:24:27 +00:00
Christopher Tate
9b564b9132 am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling 
* commit 'd323f6cfaf1b905235930f32871fd4d0919a56c5':
  Adjust key/value backup scheduling
 2015-06-01 17:07:42 +00:00
Jeff Brown
19d50b8f79 am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 
* commit '82f7affa196d9efbca7f47fdb6ce96b498172829':
  Tell PhoneWindowManager when we start/finish interactive changes.
 2015-06-01 17:07:34 +00:00
Adrian Roos
747ffe3109 am 26ee3f2b: am ddc4886f: am b85e1ecf: Fix broken transition to secure apps when relaunching 
* commit '26ee3f2bb0300ed6e5f3c0b22f8cdeb6186372e4':
  Fix broken transition to secure apps when relaunching
 2015-06-01 16:16:06 +00:00
Adrian Roos
26ee3f2bb0 am ddc4886f: am b85e1ecf: Fix broken transition to secure apps when relaunching 
* commit 'ddc4886f9e7ad77d99e8b649a43593e92270d609':
  Fix broken transition to secure apps when relaunching
 2015-06-01 16:04:27 +00:00
Olawale Ogunwale
37938cfcc1 am 995846a4: am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs" 
* commit '995846a4310ef4270177bf9d6c6673827b5625af':
  Fix null pointer dereference when security exception occurs
 2015-06-01 15:48:14 +00:00
Olawale Ogunwale
3ec7b82bba am 185a3d7d: am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps" 
* commit '185a3d7d3566348a191a448d3aff1ec6c2b97033':
  WindowManagerService not propagating X and Y steps
 2015-06-01 15:48:08 +00:00
Chris Wren
b74836329c am bb5ef426: am 8517a793: am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev 
* commit 'bb5ef42654b5a1dd768ece4a002ba0bbb941e7c6':
  add time-in-mode metrics for zen mode
 2015-06-01 15:48:02 +00:00
destradaa
b1190c779f am 36cb20bc: am aff14c59: am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868 
* commit '36cb20bc547e2d762f8ee51398143b0ab4cc0b59':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
 2015-06-01 15:47:50 +00:00
Svetoslav
b12280202d am d5464b9d: am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit 'd5464b9d07f6d5cf39d8173d5a026ce457dc458f':
  Use AtomicFile APIs correctly when reading.
 2015-06-01 15:47:32 +00:00
Narayan Kamath
13d739f576 am 0bc58c6b: am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit '0bc58c6b5c72261b9821df70d38ed4bc708a7596':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-06-01 15:45:11 +00:00
John Spurlock
19d133c1b2 am f7043e28: am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit 'f7043e284a8480df5cdbca26ff75354d2b243bb7':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:45:05 +00:00
Makoto Onuki
24f84d3432 am 7b8612d0: am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev 
* commit '7b8612d0eae188b5090f60fb4d080d6634182d0c':
  CountryDetector no longer requires location permissions.
 2015-06-01 15:44:03 +00:00
Olawale Ogunwale
995846a431 am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs" 
* commit 'd147203bc43926caddf953732682fc384ab597cb':
  Fix null pointer dereference when security exception occurs
 2015-06-01 15:33:56 +00:00
Olawale Ogunwale
185a3d7d35 am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps" 
* commit 'f9efac1291d7ada7806215d0f63661d6864e9974':
  WindowManagerService not propagating X and Y steps
 2015-06-01 15:33:50 +00:00
Chris Wren
bb5ef42654 am 8517a793: am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev 
* commit '8517a793386bfc087dae1e94f78784f5e614b230':
  add time-in-mode metrics for zen mode
 2015-06-01 15:28:25 +00:00
destradaa
36cb20bc54 am aff14c59: am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868 
* commit 'aff14c59a04586981a75392740cea997412c8821':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
 2015-06-01 15:28:11 +00:00
Svetoslav
d5464b9d07 am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit '80c2cc14e12c3f79bb617e12c0827dc0eb7e7374':
  Use AtomicFile APIs correctly when reading.
 2015-06-01 15:27:48 +00:00
Narayan Kamath
0bc58c6b5c am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit '2de63d7cc1398fe699cc2a16b47647674e4efb64':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-06-01 15:24:49 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:24:42 +00:00
Guang Zhu
74ecc15db9 am 0ca15144: am 9bb76544: fix NPE in shutdown thread 
* commit '0ca15144e375e7439a64fabcbb53d6813135cfc4':
  fix NPE in shutdown thread
 2015-06-01 15:24:03 +00:00
Makoto Onuki
7b8612d0ea am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev 
* commit '8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
  CountryDetector no longer requires location permissions.
 2015-06-01 15:23:03 +00:00
Olawale Ogunwale
ad2be762f2 Merge "Fix null pointer dereference when security exception occurs" 2015-06-01 14:45:28 +00:00
Olawale Ogunwale
5ef5378374 Merge "WindowManagerService not propagating X and Y steps" 2015-06-01 14:42:37 +00:00
Christopher Tate
3d7e0d8e21 Adjust key/value backup scheduling 
We now try to perform key/value backups only while charging, proceeding
off-charger only after we've waited a full day for the device to be
plugged in.

Bug 21076663

Change-Id: Ib32c9f8bfaf8a310f5f388907e38a28d3c54bd8e
 2015-05-30 00:49:26 +00:00
Jeff Brown
cb81d18367 Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 2015-05-30 00:33:07 +00:00
Jeff Brown
416c49c404 Tell PhoneWindowManager when we start/finish interactive changes. 
Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.

Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP.  We are now track
the early / late interactive change work separately from the rest.

Bug: 21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a
 2015-05-29 17:28:40 -07:00
Adrian Roos
b85e1ecfdf Fix broken transition to secure apps when relaunching 
Previously, the logic for keeping occluded mode during transitions
would also trigger when transitioning from the lockscreen to a
SHOW_WHEN_LOCKED activity that was already on-screen, which would
then prematurely clear the occluded mode and break the launch
transition.

With the fix, the lockscreen must already be occluded before the
keep-occluded-during-transitions logic is triggered.

Bug: 21525170
Change-Id: I1d9ad95b2dd0728af7986f09adb67a617cc62cb2
 2015-05-29 22:32:29 +00:00
Chris Wren
0886dcc768 Merge "add time-in-mode metrics for zen mode" into mnc-dev 2015-05-29 21:33:58 +00:00
destradaa
ce48c1c1d8 Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. 
b/21516868

This change makes AGpsStatus_v3 consistent and compatible with the behavior
of AGpsStatus_v2.

Change-Id: Ia4e729d8ed1d61b51ae22c7eaf9bbe33f31b7a45
 2015-05-29 13:49:20 -07:00
Svetoslav
815be147a3 Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 2015-05-29 20:05:43 +00:00
Svetoslav
3dcdd37b66 Use AtomicFile APIs correctly when reading. 
21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
 2015-05-29 13:01:37 -07:00
Guang Zhu
e422791505 fix NPE in shutdown thread 
null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
(cherry picked from commit 9bb765448df43d41e0a3edb7de1d1641c9251c35)
 2015-05-29 18:23:28 +00:00
Chris Wren
98d235bcba add time-in-mode metrics for zen mode 
Emit log whenever the mode changes, or periodically to catch devices that stay
in one mode for long stretches of time.

Bug: 20264417
Change-Id: I4efde180eef23c2afc34c6c2e78ef4d0b6c5b675
 2015-05-29 12:31:49 -04:00
Narayan Kamath
d644c56381 Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 2015-05-29 14:04:42 +00:00
Narayan Kamath
623b58b2cf Avoid inspecting packages twice to deduce ABIs for moves / installs. 
In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.

bug: 21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298
 2015-05-29 14:48:07 +01:00
John Spurlock
6a2999073c Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 2015-05-29 13:22:33 +00:00
Guang Zhu
9bb765448d fix NPE in shutdown thread 
null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
 2015-05-28 20:50:03 -07:00
John Spurlock
995a749f27 Zen: Use account name instead of calendar id in event conditions. 
- Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
 2015-05-28 22:13:03 -04:00
Wale Ogunwale
a201082c20 am a001e51f: am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev 
* commit 'a001e51f3ede9848955a1ab3b0a5fd24b4321e2a':
  Fix build
  Don't kill process with active service/receiver when task is removed.
 2015-05-29 02:03:27 +00:00
Makoto Onuki
0d889cdeb7 Merge "CountryDetector no longer requires location permissions." into mnc-dev 2015-05-28 23:54:09 +00:00
Wale Ogunwale
a001e51f3e am 0dbc5b58: am c7cbdd11: Merge "Don\'t kill process with active service/receiver when task is removed." into mnc-dev 
* commit '0dbc5b582c40bf8830362fe0bb5b64d100d7fe5d':
  Don't kill process with active service/receiver when task is removed.
 2015-05-28 23:29:58 +00:00
Tao Bao
fdc501a9bc am 69dd849e: am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 
* commit '69dd849ed3c189436025eb8914321892424af259':
  Wait for uncrypt to finish before rebooting
 2015-05-28 23:01:12 +00:00
Dianne Hackborn
e6ca5b3720 am e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev 
* commit 'e6562d903b9e62b4d4c6c08307a39577f15f1c49':
  Add new API to set URI on AssistContent.
 2015-05-28 23:01:05 +00:00
Olawale Ogunwale
fe24ae626a am 74d340b4: am 1dfb539b: am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev 
* commit '74d340b467f3c2d4ab19d4fb596212b5d72ff31f':
  Revert "Revert "Remove debugging and skip InputMethod windows""
 2015-05-28 23:00:41 +00:00
John Spurlock
7e78127fc4 am 197a8003: am 87d969a8: am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev 
* commit '197a8003168fb02692442a3cb7e2eff2f739388f':
  Backup/restore notification policy.
 2015-05-28 23:00:36 +00:00
Wale Ogunwale
c7cbdd11c3 Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev 2015-05-28 22:38:03 +00:00
Tao Bao
69dd849ed3 am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 
* commit '5f90a8c5bd689afa8403d7dce967bf96a82880c4':
  Wait for uncrypt to finish before rebooting
 2015-05-28 22:35:45 +00:00
Dianne Hackborn
e6562d903b am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev 
* commit 'da71e1004082427e36db21c39f47b13e0afa8ed4':
  Add new API to set URI on AssistContent.
 2015-05-28 22:35:39 +00:00