OSDN Git Service
Narayan Kamath [Wed, 9 Apr 2014 14:02:18 +0000 (14:02 +0000)]
am
05f980d4: am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
05f980d42d4926ab2130cdcf9e646eb610a7080b':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 14:02:08 +0000 (14:02 +0000)]
am
3856a219: am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:59:00 +0000 (13:59 +0000)]
am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
d4b644092e8d2719d01ad297b080bd50b1fdf60d':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
cecfb94f3f1b2978ba66342d7920e83770c808e3':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:55:55 +0000 (13:55 +0000)]
Merge "Make zygotes aware of their supported ABIs."
Narayan Kamath [Wed, 9 Apr 2014 13:55:54 +0000 (13:55 +0000)]
Merge "Clean up argc / argv processing for runtime args."
Narayan Kamath [Mon, 7 Apr 2014 12:56:15 +0000 (13:56 +0100)]
Make zygotes aware of their supported ABIs.
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
Narayan Kamath [Mon, 7 Apr 2014 11:44:58 +0000 (12:44 +0100)]
Clean up argc / argv processing for runtime args.
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
Narayan Kamath [Wed, 9 Apr 2014 11:33:20 +0000 (11:33 +0000)]
am
00cfbe82: am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
Don't allow MemoryFiles of negative length.
Jeff Brown [Wed, 9 Apr 2014 09:12:40 +0000 (09:12 +0000)]
am
ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '
ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
Narayan Kamath [Wed, 9 Apr 2014 09:09:58 +0000 (09:09 +0000)]
am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
Don't allow MemoryFiles of negative length.
Narayan Kamath [Wed, 9 Apr 2014 09:07:29 +0000 (09:07 +0000)]
Merge "Don't allow MemoryFiles of negative length."
Jeff Brown [Wed, 9 Apr 2014 04:33:27 +0000 (04:33 +0000)]
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 00:26:30 +0000 (17:26 -0700)]
Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
Adam Hampson [Tue, 8 Apr 2014 17:24:47 +0000 (10:24 -0700)]
resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Narayan Kamath [Tue, 8 Apr 2014 15:10:52 +0000 (16:10 +0100)]
Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
Baligh Uddin [Tue, 8 Apr 2014 02:20:37 +0000 (02:20 +0000)]
am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
Craig Mautner [Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)]
am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:14:56 +0000 (22:14 +0000)]
am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:10:47 +0000 (22:10 +0000)]
Merge "[ActivityManager] Reduce report ANR on wrong activity."
Adam Hampson [Mon, 7 Apr 2014 21:33:54 +0000 (21:33 +0000)]
am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
ce802f4898c5747038584596d9d689ca30c34c4e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:27:53 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:52:59 +0000 (20:52 +0000)]
am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
0468e3c7fae6945e21314ae2971c51dcb36972ee':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:46:58 +0000 (20:46 +0000)]
am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:43:55 +0000 (20:43 +0000)]
am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
cb163c684d7a364684ef5b1a1937aa2e92856906':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:41:00 +0000 (20:41 +0000)]
am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
331fa429cad1f464f0375a3466ba528b03c6e90d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:37:38 +0000 (20:37 +0000)]
am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:31:45 +0000 (20:31 +0000)]
am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
5f3c0630e488bbcee687933b6350370a42354dc4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
riddle_hsu [Mon, 7 Apr 2014 18:44:03 +0000 (02:44 +0800)]
[ActivityManager] Reduce report ANR on wrong activity.
Symptom: ANR report on wrong activity.
Root Cause:
KK changed resume behavior that will not update focus when only resume,
if the activity blocked, it may report ANR on previous focus.
By original concept, it will try to correct the ANR target,
but the stack of waiting(waitingVisible=true) activity may
different with current top stack.
If it gets key dispatch timeout, mResumedActivity and mPausingActivity
of its stack will be null becuase it is not top stack.
Then it is unable to change ANR target to the real no response activity.
Solution:
Use focused stack to get the real culprit.
Reproduce steps:
1.Launch an Activity X from launcher, press home key.
2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.
3.ANR dialog shows launcher is no response.
Change-Id: I99416ad91e349096f995990f2240a97616fbaf28
Baligh Uddin [Mon, 7 Apr 2014 16:16:57 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
quddusc [Sat, 5 Apr 2014 22:38:52 +0000 (22:38 +0000)]
am
17878a9a: am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:32:35 +0000 (22:32 +0000)]
am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:27:25 +0000 (22:27 +0000)]
am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
7db3875cdca4c94cb667d2d0cc86718f15e3305c':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:23:35 +0000 (22:23 +0000)]
Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
Etienne Le Grand [Sat, 5 Apr 2014 09:05:50 +0000 (09:05 +0000)]
am
819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
* commit '
819239e5bec90ee3c861ac45fffac4a832a183a1':
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
Etienne Le Grand [Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)]
am
fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
* commit '
fd53d8352a4617941b0a0449390aa562a01ea1d3':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Nick Kralevich [Fri, 4 Apr 2014 23:31:44 +0000 (23:31 +0000)]
am
4ed27328: am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
Always call super.onCreate(). Always.
Etienne Le Grand [Tue, 25 Mar 2014 04:29:28 +0000 (21:29 -0700)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
Nick Kralevich [Fri, 4 Apr 2014 23:25:52 +0000 (23:25 +0000)]
am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
dc97144b3f83bf6dae90493a6631afc6523dfce2':
Always call super.onCreate(). Always.
Nick Kralevich [Fri, 4 Apr 2014 23:18:45 +0000 (23:18 +0000)]
Merge "Always call super.onCreate(). Always."
Christopher Tate [Wed, 12 Feb 2014 21:14:10 +0000 (13:14 -0800)]
Always call super.onCreate(). Always.
Bug
12991134
(cherrypick of commit
9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)
Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
DO NOT MERGE Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
(cherry picked from
047b938f7188c21c07669108c5c68b2358f6b158)
Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
Katie McCormick [Fri, 4 Apr 2014 21:35:50 +0000 (21:35 +0000)]
am
8e63696a: am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
8e63696a73dfebae9b2ec123611db6b21968dbfd':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:31:28 +0000 (21:31 +0000)]
am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
f7bffe7707f31da920a8ff08d013934562e9a43d':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:17:29 +0000 (21:17 +0000)]
am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
fc8ea92df15689d51079212d7d012756ce9298d2':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:12:16 +0000 (21:12 +0000)]
Merge "Doc Update: notification bug fix." into klp-docs
Katie McCormick [Fri, 4 Apr 2014 21:04:36 +0000 (14:04 -0700)]
Doc Update: notification bug fix.
Fixes:
b/
13429906
Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
John Spurlock [Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)]
am
5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '
5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
John Spurlock [Fri, 4 Apr 2014 19:24:09 +0000 (19:24 +0000)]
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
John Spurlock [Thu, 3 Apr 2014 20:37:27 +0000 (16:37 -0400)]
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.
Bug:
13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
Ricardo Cervera [Fri, 4 Apr 2014 17:48:51 +0000 (17:48 +0000)]
am
d10b6543: am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
d10b65431547d66b41e4e282e9261453bb0658ff':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:42:44 +0000 (17:42 +0000)]
am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
5df825237afd016c48dd3577d839825e5161d3e7':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:39:39 +0000 (17:39 +0000)]
am
c31bd52d: am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
c31bd52df22dabf52b50e1377878548607d1f07b':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:38:59 +0000 (17:38 +0000)]
am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:32:57 +0000 (17:32 +0000)]
Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:32:42 +0000 (17:32 +0000)]
am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
a821af684e2a5f814fc8709518b5f0589c81661e':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:29:00 +0000 (17:29 +0000)]
am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
715139a620383c89e061a2b0650e184bf3382a10':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:26:05 +0000 (10:26 -0700)]
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
Ricardo Cervera [Fri, 4 Apr 2014 17:23:08 +0000 (17:23 +0000)]
Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:07:43 +0000 (17:07 +0000)]
am
13d49e9f: am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
13d49e9f364965169f933bcad6bcaeeb2f29fade':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 17:01:35 +0000 (17:01 +0000)]
am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:55:02 +0000 (16:55 +0000)]
am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:51:20 +0000 (16:51 +0000)]
Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 16:46:11 +0000 (09:46 -0700)]
docs: Fixed action bar example. Bug:
13806963
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
Ricardo Cervera [Fri, 4 Apr 2014 16:36:32 +0000 (16:36 +0000)]
am
8866eb81: am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
8866eb8155a40559c4ee0927764aa4c32e9a9cd2':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Ricardo Cervera [Fri, 4 Apr 2014 16:30:02 +0000 (16:30 +0000)]
am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Ricardo Cervera [Fri, 4 Apr 2014 16:25:45 +0000 (16:25 +0000)]
am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
07aac5e346c3fed31254e34d386c6236f1ac3f22':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Baligh Uddin [Fri, 4 Apr 2014 14:37:25 +0000 (14:37 +0000)]
am
87210ee9: (-s ours) am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
87210ee9621829786516f52fc45dfeabd5daec0a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:23 +0000 (14:37 +0000)]
am
ab0c43a4: (-s ours) am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ab0c43a4581d5b34ea9590cad4495447aa536942':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:30:55 +0000 (14:30 +0000)]
am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b285604185de1ade346eadb78971712607f54058':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:30:52 +0000 (14:30 +0000)]
am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
15fdce9d65b47e2b92bcac78776cc01486cff61a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:28:01 +0000 (14:28 +0000)]
am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
81e62eb1e576388866779e6f29d71614892dcf8a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:25:46 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:22:51 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:40 +0000 (02:26 +0000)]
am
53ccdf18: am
ef5caff8: am
c0086ba5: am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
53ccdf1894f64ea53e2dd57477c783c82b81e537':
Fix a bug in Nine Patch library. [DO NOT MERGE]