OSDN Git Service
John Spurlock [Mon, 10 Feb 2014 20:36:24 +0000 (15:36 -0500)]
Fix NPE in PolicyControl.
Bug:
12957738
Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4
Narayan Kamath [Mon, 10 Feb 2014 13:45:15 +0000 (13:45 +0000)]
am
33a608a0: am
578d4f5f: am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
33a608a0a326d9671bffd6750cb5521d6687cc57':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:39:39 +0000 (13:39 +0000)]
am
578d4f5f: am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
578d4f5f50b3b8969125376d696e893dc355faa6':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:37:18 +0000 (05:37 -0800)]
am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
56062983f1e07295c812fba0e22ce579a35b6f76':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:33:26 +0000 (13:33 +0000)]
Merge "AArch64: Use long for pointers in RS Java/JNI code"
Katie McCormick [Mon, 10 Feb 2014 13:16:42 +0000 (13:16 +0000)]
am
ffc641dd: am
6366dcbd: am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
Doc update: misc GCM fixes
Dirk Dougherty [Mon, 10 Feb 2014 13:16:38 +0000 (13:16 +0000)]
am
91bdc7d4: am
33331667: am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
Doc change: add carousel and spotlight for developer video.
Craig Mautner [Mon, 10 Feb 2014 12:51:24 +0000 (12:51 +0000)]
am
e03ed510: am
4e5b67e6: Queue startActivity params if not yet ready.
* commit '
e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
Queue startActivity params if not yet ready.
Craig Mautner [Mon, 10 Feb 2014 12:51:19 +0000 (12:51 +0000)]
am
779d204a: am
9ef471f7: Don\'t remove Activities and Tasks until animation done
* commit '
779d204abe6a3922b572822df5cd775ffd5d77e8':
Don't remove Activities and Tasks until animation done
Christopher Tate [Mon, 10 Feb 2014 12:51:15 +0000 (12:51 +0000)]
am
88daefd4: am
379bb6ed: am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
Use canonical path for /vendor/app
John Spurlock [Mon, 10 Feb 2014 12:51:06 +0000 (12:51 +0000)]
am
cd4cf932: am
6691bfd6: am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
cd4cf932d994c392ca6da21dc32a26d6d467b721':
Example controller app for system ui demo mode.
Jean-Luc Brouillet [Mon, 10 Feb 2014 12:51:01 +0000 (12:51 +0000)]
Dan Sandler [Mon, 10 Feb 2014 12:50:24 +0000 (12:50 +0000)]
am
9e07c1c4: am
6b1f3acd: am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
Make sure to turn off led after pulse()
Katie McCormick [Sat, 8 Feb 2014 18:44:52 +0000 (18:44 +0000)]
am
6366dcbd: am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
6366dcbd494afe20912a932bb18faf199e4a1c62':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:44:49 +0000 (18:44 +0000)]
am
33331667: am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
3333166738ca1382307bcf61e30adba6bdec83d4':
Doc change: add carousel and spotlight for developer video.
Katie McCormick [Sat, 8 Feb 2014 18:39:07 +0000 (18:39 +0000)]
am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:39:01 +0000 (18:39 +0000)]
am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
3f43b646294857ea2dbd5e2fba944ee0d4c19657':
Doc change: add carousel and spotlight for developer video.
Katie McCormick [Sat, 8 Feb 2014 18:34:54 +0000 (18:34 +0000)]
am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
44085b68add3d7583f7832c51409de83655fc4f1':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:34:44 +0000 (18:34 +0000)]
am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
7fd4d29e847984c02561c7f385bfe0947432012e':
Doc change: add carousel and spotlight for developer video.
Igor Murashkin [Sat, 8 Feb 2014 02:54:03 +0000 (02:54 +0000)]
Merge "camera2: Simplify min frame durations and add available stream configs"
Igor Murashkin [Sat, 8 Feb 2014 02:52:34 +0000 (18:52 -0800)]
camera2: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
Ruben Brunk [Sat, 8 Feb 2014 02:39:22 +0000 (02:39 +0000)]
Merge "camera2: Update hotpixel tags."
Ruben Brunk [Sat, 8 Feb 2014 02:23:50 +0000 (18:23 -0800)]
camera2: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
Igor Murashkin [Sat, 8 Feb 2014 02:35:49 +0000 (02:35 +0000)]
Merge "camera2: Add tags for querying capabilities of a camera device"
Igor Murashkin [Sat, 8 Feb 2014 02:34:37 +0000 (18:34 -0800)]
camera2: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
Igor Murashkin [Sat, 8 Feb 2014 02:22:55 +0000 (02:22 +0000)]
Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"
Igor Murashkin [Sat, 8 Feb 2014 02:20:48 +0000 (18:20 -0800)]
camera2: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
Katie McCormick [Sat, 8 Feb 2014 01:58:53 +0000 (01:58 +0000)]
am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
f2fcbff8382b93bd779af546a7dda8f85eba3763':
Doc update: misc GCM fixes
Katie McCormick [Sat, 8 Feb 2014 01:55:43 +0000 (01:55 +0000)]
Merge "Doc update: misc GCM fixes" into klp-docs
Katie McCormick [Sat, 8 Feb 2014 01:36:03 +0000 (17:36 -0800)]
Doc update: misc GCM fixes
Fixes for:
b/
12909231
b/
12887320
b/
12872407
Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
Ruben Brunk [Sat, 8 Feb 2014 01:33:36 +0000 (17:33 -0800)]
camera3: Update raw color calibration transform tags.
Change-Id: Ic7a8c68e83b3eb257bd15380baad6370c5eb0dbc
Ruben Brunk [Sat, 8 Feb 2014 01:19:27 +0000 (17:19 -0800)]
Fixbuild. Add api update for camera profile tags.
Change-Id: Id25801ee3f17b721c6d5335a8a8d21041bec068f
Ruben Brunk [Sat, 8 Feb 2014 00:58:09 +0000 (16:58 -0800)]
camera3: Add camera profile properties.
Change-Id: I39f6067bb1c05b8b00b0205bb367312112407299
Zhijun He [Sat, 8 Feb 2014 00:36:17 +0000 (00:36 +0000)]
Merge "Camera2: Add OFF_KEEP_STATE mode"
Zhijun He [Sat, 8 Feb 2014 00:13:46 +0000 (16:13 -0800)]
Camera2: Add OFF_KEEP_STATE mode
Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
Ruben Brunk [Sat, 8 Feb 2014 00:12:46 +0000 (00:12 +0000)]
Merge "camera3: Make blackLevelPattern optional."
Ruben Brunk [Sat, 8 Feb 2014 00:08:38 +0000 (16:08 -0800)]
camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
Zhijun He [Fri, 7 Feb 2014 23:59:42 +0000 (23:59 +0000)]
Merge "Camera2: Update focus distance related tags"
Zhijun He [Fri, 7 Feb 2014 23:44:30 +0000 (15:44 -0800)]
Camera2: Update focus distance related tags
Change-Id: Ib94311c3168802aea2193a282185e0cd70a547cb
Ruben Brunk [Fri, 7 Feb 2014 23:52:45 +0000 (23:52 +0000)]
Merge "camera3: Add camera neutral tag."
Ruben Brunk [Fri, 7 Feb 2014 23:47:10 +0000 (15:47 -0800)]
camera3: Add camera neutral tag.
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
Ruben Brunk [Fri, 7 Feb 2014 23:39:43 +0000 (23:39 +0000)]
Merge "camera3: Update blackLevelPattern tag."
Ruben Brunk [Fri, 7 Feb 2014 23:26:29 +0000 (15:26 -0800)]
camera3: Update blackLevelPattern tag.
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
Craig Mautner [Fri, 7 Feb 2014 23:37:56 +0000 (23:37 +0000)]
am
4e5b67e6: Queue startActivity params if not yet ready.
* commit '
4e5b67e69560ca443d5fb4b78abf56ae948f578c':
Queue startActivity params if not yet ready.
Craig Mautner [Fri, 7 Feb 2014 23:37:53 +0000 (23:37 +0000)]
am
9ef471f7: Don\'t remove Activities and Tasks until animation done
* commit '
9ef471f7f2f59de032d7cb9c3c7241486109979e':
Don't remove Activities and Tasks until animation done
Christopher Tate [Fri, 7 Feb 2014 23:37:03 +0000 (23:37 +0000)]
am
379bb6ed: am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
379bb6ed4ea4de035569b04018f84d7ce95a8036':
Use canonical path for /vendor/app
Christopher Tate [Fri, 7 Feb 2014 23:33:17 +0000 (15:33 -0800)]
am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
ff27e6bc44097485abfde24f396399e5eec9ff6d':
Use canonical path for /vendor/app
Christopher Tate [Fri, 7 Feb 2014 23:30:23 +0000 (23:30 +0000)]
Merge "Use canonical path for /vendor/app"
Craig Mautner [Fri, 7 Feb 2014 23:30:03 +0000 (15:30 -0800)]
Queue startActivity params if not yet ready.
If the ActivityView is not ready when the startActivity method is
called we now save the Intent until the ActivityView is ready.
Fixes bug
12821638.
Change-Id: I30ebb2699963f174cc2d5a3fb77a99ed33a4252b
ztenghui [Fri, 7 Feb 2014 22:09:39 +0000 (22:09 +0000)]
Merge "Add the clipToOutline by just using the clipPathOp"
Dianne Hackborn [Fri, 7 Feb 2014 21:56:45 +0000 (21:56 +0000)]
Merge "Battery stats: more events, fixes."
Dianne Hackborn [Fri, 7 Feb 2014 21:01:07 +0000 (13:01 -0800)]
Battery stats: more events, fixes.
Add new history events for top application package and
foreground application packages.
Doing this involved a fair amount of improvement to history
events. The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active. With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.
Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits. These packing structures are changed to work
together correctly.
Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
ztenghui [Thu, 6 Feb 2014 18:33:58 +0000 (10:33 -0800)]
Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
Craig Mautner [Fri, 7 Feb 2014 21:11:47 +0000 (13:11 -0800)]
Don't remove Activities and Tasks until animation done
Just like stacks and displays, activities and tasks need to stick
around until animations have completed.
Change-Id: I54fe8f6855d60cbc3a25cbc6e762defd5ac50bf5
John Spurlock [Fri, 7 Feb 2014 21:03:39 +0000 (21:03 +0000)]
am
6691bfd6: am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
6691bfd6462e27af7075a3a46eccce943f0de9dd':
Example controller app for system ui demo mode.
John Spurlock [Fri, 7 Feb 2014 21:01:42 +0000 (13:01 -0800)]
am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
Example controller app for system ui demo mode.
John Spurlock [Fri, 7 Feb 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Example controller app for system ui demo mode."
Dirk Dougherty [Fri, 7 Feb 2014 20:52:33 +0000 (20:52 +0000)]
am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
392ddb22973cab737e8e8487565f4c6147500703':
Doc change: add carousel and spotlight for developer video.
Derek Sollenberger [Fri, 7 Feb 2014 20:52:22 +0000 (20:52 +0000)]
Merge "Keep the SkPaint used when creating a layer."
Dirk Dougherty [Fri, 7 Feb 2014 20:50:24 +0000 (20:50 +0000)]
Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
John Spurlock [Fri, 7 Feb 2014 19:47:47 +0000 (14:47 -0500)]
Example controller app for system ui demo mode.
Demo mode is protected behind a system setting. To enable:
$ adb shell settings put global sysui_demo_allowed 1
Change-Id: I2248e27a253bf9eac176e8be9153a2b147cefa40
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:43:31 +0000 (19:43 +0000)]
John Spurlock [Fri, 7 Feb 2014 19:25:19 +0000 (19:25 +0000)]
Merge "Make QS battery composite color match others."
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:11:28 +0000 (11:11 -0800)]
am
11e6cabc: Merge "Fix a typo."
* commit '
11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
Fix a typo.
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:08:36 +0000 (19:08 +0000)]
Merge "Fix a typo."
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:04:26 +0000 (11:04 -0800)]
Fix a typo.
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
Chris Craik [Fri, 7 Feb 2014 18:47:57 +0000 (18:47 +0000)]
Merge "Rework and clean up DisplayList projection"
Derek Sollenberger [Wed, 5 Feb 2014 21:47:00 +0000 (16:47 -0500)]
Keep the SkPaint used when creating a layer.
This will allow us to inspect the paint for thing other than
color and xfermode, such as SkColorFilters and SkShaders.
bug:
10650594
Change-Id: I2c3ddd07a3966e1e77af34136307e2b59b2898c1
Kenny Root [Fri, 7 Feb 2014 17:12:48 +0000 (09:12 -0800)]
KeyChain: add explicit package for getPrivateKey
Bug:
9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
Dan Sandler [Fri, 7 Feb 2014 16:05:31 +0000 (16:05 +0000)]
am
6b1f3acd: am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
6b1f3acdf0f0806c0b3826d1c4ea43bd6cc6f021':
Make sure to turn off led after pulse()
Dan Sandler [Fri, 7 Feb 2014 16:02:15 +0000 (08:02 -0800)]
am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
6ea720bacb805e88fc3b8634bbd9dc7fa918beaa':
Make sure to turn off led after pulse()
Dan Sandler [Fri, 7 Feb 2014 15:59:08 +0000 (15:59 +0000)]
Merge "Make sure to turn off led after pulse()"
Narayan Kamath [Fri, 7 Feb 2014 11:34:18 +0000 (11:34 +0000)]
Merge "Fix several bad function definitions."
Jim Miller [Thu, 6 Feb 2014 01:30:50 +0000 (17:30 -0800)]
Fix problem where input wasn't being requested
This fixes a bug where input wasn't being enabled when the security
method changed. The solution is to propagate changes back to the parent
Add missing copyright header to simplified keyguard view.
Bugs
12135931,
12879769
Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
Jim Miller [Tue, 4 Feb 2014 01:57:23 +0000 (17:57 -0800)]
Add KeyguardSimpleHostView and make it the default
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.
Bug
12135931
Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
Jim Miller [Wed, 29 Jan 2014 02:22:42 +0000 (18:22 -0800)]
Move launch, verification and menu logic to base class
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.
Bug
12135931
Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
Chris Craik [Thu, 6 Feb 2014 00:50:41 +0000 (16:50 -0800)]
Rework and clean up DisplayList projection
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.
Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).
Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
Chris Craik [Thu, 6 Feb 2014 23:22:27 +0000 (23:22 +0000)]
Merge "Simplify DisplayList matrices"
Dirk Dougherty [Wed, 5 Feb 2014 20:58:40 +0000 (12:58 -0800)]
Doc change: add carousel and spotlight for developer video.
Change-Id: I715e559c880bb76939ba1a423c3927aacc16e2a1
Adam Powell [Thu, 6 Feb 2014 22:41:14 +0000 (22:41 +0000)]
Merge "Refactoring of fitSystemWindows to applyWindowInsets for views"
Ricardo Cervera [Thu, 6 Feb 2014 21:29:59 +0000 (21:29 +0000)]
am
adb94013: am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
adb940131adf137023006fcd86663fd048fa6a54':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:26:03 +0000 (21:26 +0000)]
am
a5e35cb0: am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
a5e35cb002936291b79ff422c94eb2caabedfb3a':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:23:40 +0000 (21:23 +0000)]
am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8ff1f285c93a1a44a7419ab216bee2f92518387a':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:20:28 +0000 (21:20 +0000)]
am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
b7d456d4a410d1a17933ed0256fecd2144160615':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:19:50 +0000 (21:19 +0000)]
am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
6ed268623b9e4a10a080e15d64340c16d2dd8a28':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:17:12 +0000 (21:17 +0000)]
am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:16:28 +0000 (21:16 +0000)]
am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
74d290fd62dfec09708664f354805c548b3dc5eb':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:13:29 +0000 (21:13 +0000)]
am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8756b0c3cea50d47ba7191d8a493f774b23a1631':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:13:21 +0000 (21:13 +0000)]
am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
d057fa6d40198e07844f702608b7959bad3bd48b':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:36 +0000 (21:09 +0000)]
am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
531939d151167e56b3106205f4c3d859a9f509ce':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:12 +0000 (21:09 +0000)]
Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
Ricardo Cervera [Thu, 6 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
Craig Mautner [Thu, 6 Feb 2014 20:36:56 +0000 (20:36 +0000)]
am
43ef013c: (-s ours) am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
43ef013cbd769533737135af5a338898cc619602':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 20:29:49 +0000 (20:29 +0000)]
am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
DO NOT MERGE. Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
John Reck [Thu, 6 Feb 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Remove overdraw counter"
Adam Lesinski [Thu, 6 Feb 2014 20:25:51 +0000 (20:25 +0000)]
am
a5a93f55: am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:16:30 +0000 (20:16 +0000)]
am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:13:20 +0000 (20:13 +0000)]
Merge "Check feature bits before loading optional services" into klp-modular-dev
John Reck [Thu, 6 Feb 2014 00:53:34 +0000 (16:53 -0800)]
Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd