Narayan Kamath
3a35bf3f9c
am 72f9838c: am 222722ee: Merge "Tell installd when boot completes." into lmp-mr1-dev
...
* commit '72f9838c99a9cb8d84b8ec4af5372f10eeeb4e94':
Tell installd when boot completes.
2014-11-12 12:55:29 +00:00
Narayan Kamath
222722ee73
Merge "Tell installd when boot completes." into lmp-mr1-dev
2014-11-12 12:48:22 +00:00
Jeff Brown
a473878158
am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
...
automerge: c1275e7
* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
Move device admin max screen off timeout to internal interface.
2014-11-12 00:24:43 +00:00
Jeff Brown
32f7a6d813
Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
2014-11-11 22:27:45 +00:00
Narayan Kamath
76a748e62f
Tell installd when boot completes.
...
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.
bug: 18280671
Change-Id: I878f1463c7f523892605c17b980a51ac3b6645e2
2014-11-11 10:50:46 +00:00
Andres Morales
9e19c118a1
am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
...
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:58:53 +00:00
Andres Morales
cc8d56f66c
Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
2014-11-10 16:48:45 +00:00
Sander Alewijnse
1b0dbd5c95
am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
...
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
Added the restrictions pending application restrictions key.
2014-11-07 22:35:51 +00:00
Sander Alewijnse
3eed90f393
Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
2014-11-07 22:25:00 +00:00
Sander Alewijnse
53d63dcd04
Added the restrictions pending application restrictions key.
...
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
2014-11-07 22:19:48 +00:00
Jeff Brown
5ce1cb240b
Move device admin max screen off timeout to internal interface.
...
The setting was previously exposed in IPowerManager but it
doesn't need to be there.
Bug: 17656076
Change-Id: If3ed0cbe89f67c60aa00376be0c54b1bd9656144
2014-11-06 19:34:21 -08:00
Andres Morales
cd3b72e6f9
Unhide DISALLOW_OUTGOING_BEAM
...
Bug:17387303
Change-Id: If4410bbfd9f82c84886024a091454ee931d9d930
2014-11-06 12:31:32 -08:00
Dianne Hackborn
726715e113
am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
...
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
Few more small meminfo improvements.
2014-11-04 02:21:11 +00:00
Dianne Hackborn
1842930762
Few more small meminfo improvements.
...
- Add in category for graphics driver, and knowledge about it
for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
that, so it is clear what they are talking about.
Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
2014-11-03 13:58:11 -08:00
Jeff Brown
5177979bbd
am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e
...
automerge: a80162f
* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
Add a function to boost screen brightness temporarily.
2014-11-01 15:04:52 +00:00
Jeff Brown
0ed053ef53
am e333e674: Add a function to boost screen brightness temporarily.
...
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
Add a function to boost screen brightness temporarily.
2014-11-01 14:10:46 +00:00
Jeff Brown
e333e674a7
Add a function to boost screen brightness temporarily.
...
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00
Lorenzo Colitti
fa186dbd3d
am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
...
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
Add support for running 464xlat on wifi as well.
2014-10-31 00:16:09 +00:00
Lorenzo Colitti
2f3dab8585
am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev
...
automerge: ba69b3f
* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
Support more than one clatd at a time.
2014-10-30 19:07:02 +00:00
Lorenzo Colitti
e21a26b3ba
Add support for running 464xlat on wifi as well.
...
1. Add a command to NetworkManagementService to enable/disable
IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
on a wifi network (which means it detected a NAT64), and
correspondingly re-enable offload when the clatd interface
goes down.
This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.
Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
2014-10-30 20:31:26 +09:00
Lorenzo Colitti
def4cd4fa4
Merge "Support more than one clatd at a time." into lmp-mr1-dev
2014-10-29 03:43:04 +00:00
Nicolas Prevot
ecdc14dc31
am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
...
automerge: e86848c
* commit 'e86848c258a2fc42e52eb1e3234c1288acd96a3b':
Replace minimum with maximum in method description.
2014-10-28 18:05:09 +00:00
Lorenzo Colitti
954394653d
Support more than one clatd at a time.
...
1. Make Nat464Xlat a per-network object, one for every network
requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
interface.
3. When we attempt to start clatd on a network, store its
Nat464Xlat object in the NetworkAgentInfo, so we have an
authoritative way of knowing whether clat is running on a
given network.
4. Rework Nat464Xlat, hopefully simplifying it.
Bug: 12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
2014-10-29 01:23:26 +09:00
Nicolas Prevot
555f1986f1
Replace minimum with maximum in method description.
...
BUG:18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
2014-10-28 16:18:47 +00:00
Dianne Hackborn
019de15ca2
am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
...
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
Fix issue #17948288 : Improve accuracy of memory use reporting
2014-10-18 00:52:07 +00:00
Dianne Hackborn
b3af4ec6ba
Fix issue #17948288 : Improve accuracy of memory use reporting
...
We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.
It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.
Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
2014-10-17 15:25:13 -07:00
Dianne Hackborn
eff986af30
am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit '9baa4506f1e7218d555d37a2057325c68492f080':
SDK only: hide the old L API version constant.
2014-10-17 19:16:37 +00:00
Dianne Hackborn
3182987eb8
am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
SDK only: hide the old L API version constant.
2014-10-17 18:53:37 +00:00
Dianne Hackborn
aa02bce2f4
am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev
...
* commit '56ae044791aa9a800292eb0f6c3852ede91f17c2':
Add API level for MR1.
2014-10-17 17:19:55 +00:00
Dianne Hackborn
3b6968876f
Add API level for MR1.
...
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
2014-10-16 18:14:12 -07:00
Dianne Hackborn
d3511d4be1
SDK only: hide the old L API version constant.
...
Also update the LOLLIPOP version constant to describe more things
that change when you target it.
Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
2014-10-16 17:49:45 -07:00
Amith Yamasani
d060a29e52
am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-15 02:04:06 +00:00
Amith Yamasani
6d93491f50
Hide DISALLOW_OUTGOING_BEAM API
...
This is not fully functional in managed profiles, so it is being removed for L.
Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
2014-10-14 09:31:30 -07:00
Dianne Hackborn
5457d5ccb6
am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
...
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
Improve some docs, fix some debugging.
2014-10-10 21:06:48 +00:00
Dianne Hackborn
75a6e82bcc
am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
...
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
Put in real "code" (aka marketing) name.
2014-10-10 04:26:40 +00:00
Dianne Hackborn
ab4a81b3c6
Improve some docs, fix some debugging.
...
- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.
Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
2014-10-09 18:21:59 -07:00
Dianne Hackborn
89b196958f
Merge "Put in real "code" (aka marketing) name." into lmp-dev
2014-10-08 17:59:19 +00:00
Dianne Hackborn
955d8d69ea
Put in real "code" (aka marketing) name.
...
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
2014-10-07 20:17:19 -07:00
Amith Yamasani
34a2a6ca93
am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
...
* commit '42f611f2f5cbc68a6aaac18ed9e3c62ebc765901':
Set the default user restrictions to disallow calling and sms
2014-10-07 18:02:29 +00:00
Amith Yamasani
41bb3455e4
Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
2014-10-07 17:11:34 +00:00
Amith Yamasani
aa6634eaca
Set the default user restrictions to disallow calling and sms
...
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.
Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
2014-10-06 18:24:32 -07:00
John Spurlock
29ab5f7dc0
am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '42730c93466d2ff533b42f56b4dd0080aad40d59':
Fix NPE in StrictMode handling.
2014-10-06 19:39:41 +00:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
Dianne Hackborn
cba999c164
am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 21:52:23 +00:00
Dianne Hackborn
d867b7c7a2
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
...'java.lang.String java.lang.String.substring(int)' on a null object reference
Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
2014-10-03 11:43:10 -07:00
Dianne Hackborn
4bcfcc6941
am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
...
* commit 'b49a19b9bd2fed00b8fbf3f5a4f9fb7c34e969a3':
SDK only: Update docs to reflect current implementation.
2014-10-02 23:37:54 +00:00
Dianne Hackborn
7a73f2c5aa
Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
2014-10-02 22:49:43 +00:00
Dianne Hackborn
67a101aa30
SDK only: Update docs to reflect current implementation.
...
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
2014-10-02 12:44:01 -07:00
Sreeram Ramachandran
44774ad079
am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
...
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
Send app permissions to netd.
2014-10-02 13:39:05 +00:00
Dianne Hackborn
7cf6cac507
am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
More work on issue #17656716 : Unhandled exception in Window Manager
2014-10-02 13:38:23 +00:00