Amith Yamasani
91413e745d
am 745ec38b: am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev
...
* commit '745ec38bdca1e86dd0093ade4a382880fda7743a':
UserHandle to UserSerialNo mapping
2012-08-17 09:24:34 -07:00
Amith Yamasani
745ec38bdc
am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev
...
* commit '9c38d6e52bb71671c6f034a10b6751a1569c9ee0':
UserHandle to UserSerialNo mapping
2012-08-17 09:22:55 -07:00
Amith Yamasani
9c38d6e52b
Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev
2012-08-17 09:20:29 -07:00
Amith Yamasani
2a00329c6d
UserHandle to UserSerialNo mapping
...
Use AtomicFile for usermanager files.
Added a MANAGE_USERS permission that apps (signature permission) can use
to create/query/modify/remove users.
Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
2012-08-17 09:06:10 -07:00
Magnus Strandberg
1968256926
Fix for updating TCP buffer size when switching network type
...
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.
Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
2012-08-17 11:38:44 +02:00
Joe Onorato
0058d79d86
am ae37cd4a: am bc11e52c: am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"
...
* commit 'ae37cd4a27c06f39b923fe4fc3c4c54914d73e9e':
Get rid of LOCAL_MODULE_TAGS := user
2012-08-17 01:02:41 -07:00
Joe Onorato
ae37cd4a27
am bc11e52c: am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"
...
* commit 'bc11e52cafa182996a338641c86bf3a07f571b1d':
Get rid of LOCAL_MODULE_TAGS := user
2012-08-17 00:52:12 -07:00
Joe Onorato
bc11e52caf
am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"
...
* commit '406ba83154ba17921bc524c479d3339448306fc5':
Get rid of LOCAL_MODULE_TAGS := user
2012-08-17 00:50:11 -07:00
Joe Onorato
406ba83154
am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"
...
* commit '5f61087e26013ea2623aecb1783c74a57a9fa49c':
Get rid of LOCAL_MODULE_TAGS := user
2012-08-17 00:48:03 -07:00
Joe Onorato
5f61087e26
Merge "Get rid of LOCAL_MODULE_TAGS := user"
2012-08-17 00:40:50 -07:00
Jeff Sharkey
f9196d2bec
am 603aeda5: am bdd0c91b: Merge "Create media paths for existing users." into jb-mr1-dev
...
* commit '603aeda5a67b6c7a54f2dea50d5f05113e437d14':
Create media paths for existing users.
2012-08-16 23:36:02 -07:00
Jeff Sharkey
603aeda5a6
am bdd0c91b: Merge "Create media paths for existing users." into jb-mr1-dev
...
* commit 'bdd0c91ba82bd8eb319c8fe0fb046512b0d0a49b':
Create media paths for existing users.
2012-08-16 23:33:43 -07:00
Jeff Sharkey
bdd0c91ba8
Merge "Create media paths for existing users." into jb-mr1-dev
2012-08-16 23:31:50 -07:00
Jeff Sharkey
91bbb8a1e9
Create media paths for existing users.
...
Bug: 6925012
Change-Id: I23bd9187217645cf538e074527c143a911a61299
2012-08-16 23:29:34 -07:00
Joe Onorato
fffd12249d
Get rid of LOCAL_MODULE_TAGS := user
...
Change-Id: I1c4e67f935a7c511cda9980f4475dfd0272617a5
2012-08-16 22:46:41 -07:00
Joe Onorato
0e462950d9
Get rid of LOCAL_MODULE_TAGS := user
...
Change-Id: I1c4e67f935a7c511cda9980f4475dfd0272617a5
2012-08-16 22:37:58 -07:00
The Android Open Source Project
47c4b722af
am 25915644: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '259156444c5ecb63ce12e6911c2ee92ac9deb15e':
Set the brightness to zero on screen-off
Allow the panels to be temporarily dragged past their contents.
Fix crash in SystemUI.
Turn off an assert.
Fix status bar disabling.
Glyph cache optimization
2012-08-16 19:13:06 -07:00
The Android Open Source Project
259156444c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ica4f7fbb23b13d145c11f1e58fdd68011b435ee3
2012-08-16 19:10:29 -07:00
The Android Open Source Project
da24523f7b
am f2e3e899: (-s ours) am 1da9902f: am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit 'f2e3e8991739beb58aab6fa919434d641a52c063':
show 3G icon for CDMA/1xRTT
2012-08-16 19:04:40 -07:00
The Android Open Source Project
f2e3e89917
am 1da9902f: am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '1da9902f2ed51221a10f4e61e45c078f4d2eec92':
show 3G icon for CDMA/1xRTT
2012-08-16 19:02:02 -07:00
The Android Open Source Project
1da9902f2e
am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '2679082da074b29be8ac8e6f9bb02591318be388':
show 3G icon for CDMA/1xRTT
2012-08-16 18:59:11 -07:00
The Android Open Source Project
2679082da0
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465
2012-08-16 18:56:53 -07:00
Nick Pelly
9f3bd6b95a
am 2f724256: am 76b858e3: Merge "Add documentation for com.android.location.provider shared library." into jb-mr1-dev
...
* commit '2f7242565c7977142626b880b941a8030c7b6331':
Add documentation for com.android.location.provider shared library.
2012-08-16 18:12:17 -07:00
Nick Pelly
f34eae6d23
am 78e9ea9c: am 1f3f128a: Merge "Add javadoc for new location API\'s." into jb-mr1-dev
...
* commit '78e9ea9c7b4cce2317a24f57cd67d74c53bd1eaf':
Add javadoc for new location API's.
2012-08-16 18:10:35 -07:00
Nick Pelly
2f7242565c
am 76b858e3: Merge "Add documentation for com.android.location.provider shared library." into jb-mr1-dev
...
* commit '76b858e3794f652c4af2323504787aebbbb7e89a':
Add documentation for com.android.location.provider shared library.
2012-08-16 18:09:50 -07:00
Nick Pelly
78e9ea9c7b
am 1f3f128a: Merge "Add javadoc for new location API\'s." into jb-mr1-dev
...
* commit '1f3f128ad1744dfbe4108857f322a805b1dc5eb7':
Add javadoc for new location API's.
2012-08-16 18:08:09 -07:00
Nick Pelly
76b858e379
Merge "Add documentation for com.android.location.provider shared library." into jb-mr1-dev
2012-08-16 18:07:28 -07:00
Nick Pelly
1f3f128ad1
Merge "Add javadoc for new location API's." into jb-mr1-dev
2012-08-16 18:05:32 -07:00
Nick Pelly
b03c8c508d
Add documentation for com.android.location.provider shared library.
...
Change-Id: I222d61811c88272e84a85512623210c0238337e5
2012-08-16 17:59:35 -07:00
Nick Pelly
4e31c4fffb
Add javadoc for new location API's.
...
Change-Id: If15024ee88421c07ba3a174747774fc451fd002e
2012-08-16 17:59:34 -07:00
The Android Automerger
ed970b4899
merge in jb-mr0-release history after reset to jb-dev
2012-08-16 17:57:44 -07:00
Subir Jhanb
84404677b8
am b4b692f9: am 2ff0c048: Merge "Change directory permission to "signature|system"" into jb-mr1-dev
...
* commit 'b4b692f9a861041692d13363e594fbae2bbd7f87':
Change directory permission to "signature|system"
2012-08-16 17:22:56 -07:00
Subir Jhanb
b4b692f9a8
am 2ff0c048: Merge "Change directory permission to "signature|system"" into jb-mr1-dev
...
* commit '2ff0c048446c47f9cb995def2a6d8cc5177533a2':
Change directory permission to "signature|system"
2012-08-16 17:20:34 -07:00
Subir Jhanb
2ff0c04844
Merge "Change directory permission to "signature|system"" into jb-mr1-dev
2012-08-16 17:18:21 -07:00
Subir Jhanb
0224ccab3c
Change directory permission to "signature|system"
...
Change-Id: I53dea6984b4577803fdead5caad0112503d2b4e5
2012-08-16 17:04:54 -07:00
Kenny Root
133c096134
am 799ee212: am 9a994b53: am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit '799ee2127efae8e112f333c13c3da89d1d97589d':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:48:55 -07:00
Kenny Root
799ee2127e
am 9a994b53: am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit '9a994b5350731b8169a9b25463f57266ee2988fb':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:46:46 -07:00
Kenny Root
9a994b5350
am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit '050c87f87e2a48c7bc90f5b15fb6e4e37e667286':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:43:20 -07:00
Kenny Root
050c87f87e
am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:33:40 -07:00
Jeff Brown
06d4e28b9b
am d68ffb09: am 13c589b6: Animate brightness with electron beam.
...
* commit 'd68ffb09241580ce026be10be69c164d7e7ea225':
Animate brightness with electron beam.
2012-08-16 16:32:55 -07:00
Jeff Brown
d68ffb0924
am 13c589b6: Animate brightness with electron beam.
...
* commit '13c589b66c47aa4d988eecce9a12c39d580939c9':
Animate brightness with electron beam.
2012-08-16 16:31:36 -07:00
Jeff Brown
13c589b66c
Animate brightness with electron beam.
...
Also added an internal flag to control whether the electron beam
on animation is used. It's on for now but we might want to
turn if off if we can't get the HAL to provide the
necessary screen on synchronization on all devices.
Change-Id: Iaa3cfa0fd61de10174e68351e4db890eff2d2918
2012-08-16 16:26:54 -07:00
Kenny Root
a950daf5c1
Merge changes Ieb566a2a,I953057cd
...
* changes:
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:06:29 -07:00
Chet Haase
70b9ca266b
am 562500d3: am cc48c144: Merge "Make animators more robust against ending mid-stream" into jb-mr1-dev
...
* commit '562500d3e46ee9f136b17c39d6884ac0880dbb2b':
Make animators more robust against ending mid-stream
2012-08-16 15:40:43 -07:00
Chet Haase
562500d3e4
am cc48c144: Merge "Make animators more robust against ending mid-stream" into jb-mr1-dev
...
* commit 'cc48c144bb0c15e003d1b9469c87a2c132ea6308':
Make animators more robust against ending mid-stream
2012-08-16 15:38:30 -07:00
Jean-Baptiste Queru
f39d51643a
am df8d55c4: am 97fb26c8: am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489 : drm content corruption on GB"
...
* commit 'df8d55c4aa433946b69294eb64c54f9a230cb8e6':
Fix Issue #35489 : drm content corruption on GB
2012-08-16 15:37:21 -07:00
Kenny Root
7abab32c00
am af101312: am 520ee7bc: am a2e8365c: am 9b0da58e: Merge "Introduce a restorecon JNI binding."
...
* commit 'af101312c880f440a2c33965e4479feaa1fd6b82':
Introduce a restorecon JNI binding.
2012-08-16 15:37:16 -07:00
Kenny Root
b2a6da1b69
am 78f4e545: am 3931f6b3: am 617ccc08: am 1090f702: Merge "Remove StatFs from AndroidRuntime JNI"
...
* commit '78f4e5452dbd4776931d011367f724de15ecd252':
Remove StatFs from AndroidRuntime JNI
2012-08-16 15:37:14 -07:00
Chet Haase
cc48c144bb
Merge "Make animators more robust against ending mid-stream" into jb-mr1-dev
2012-08-16 15:35:29 -07:00
Jean-Baptiste Queru
df8d55c4aa
am 97fb26c8: am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489 : drm content corruption on GB"
...
* commit '97fb26c838340a7e21a7c3249940bc11df70c873':
Fix Issue #35489 : drm content corruption on GB
2012-08-16 15:35:14 -07:00