OSDN Git Service
Narayan Kamath [Wed, 18 Dec 2013 18:20:42 +0000 (18:20 +0000)]
am
f08b83be: am
4dd5c377: am
be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '
f08b83beeef66b603dd3df1140e35f8e3f94d344':
Remove unused field from MediaMuxer
Narayan Kamath [Wed, 18 Dec 2013 18:18:04 +0000 (18:18 +0000)]
am
4dd5c377: am
be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '
4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
Remove unused field from MediaMuxer
Narayan Kamath [Wed, 18 Dec 2013 18:14:45 +0000 (10:14 -0800)]
am
be8fbb8f: Merge "Remove unused field from MediaMuxer"
* commit '
be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
Remove unused field from MediaMuxer
Narayan Kamath [Wed, 18 Dec 2013 18:08:58 +0000 (18:08 +0000)]
Merge "Remove unused field from MediaMuxer"
Narayan Kamath [Wed, 18 Dec 2013 17:51:06 +0000 (17:51 +0000)]
Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
Narayan Kamath [Wed, 18 Dec 2013 13:05:44 +0000 (13:05 +0000)]
am
04d02d97: am
39d76302: am
3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '
04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
Don't pseudolocalize untranslatable strings.
Narayan Kamath [Wed, 18 Dec 2013 13:02:39 +0000 (13:02 +0000)]
am
39d76302: am
3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '
39d7630234127327d71a773dd563067989da4211':
Don't pseudolocalize untranslatable strings.
Narayan Kamath [Wed, 18 Dec 2013 13:00:02 +0000 (05:00 -0800)]
am
3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."
* commit '
3da645f307695949623d78f280ce12e932eb057c':
Don't pseudolocalize untranslatable strings.
Narayan Kamath [Wed, 18 Dec 2013 12:46:40 +0000 (12:46 +0000)]
Merge "Don't pseudolocalize untranslatable strings."
Scott Main [Wed, 18 Dec 2013 00:50:59 +0000 (00:50 +0000)]
Scott Main [Wed, 18 Dec 2013 00:48:03 +0000 (00:48 +0000)]
Scott Main [Wed, 18 Dec 2013 00:44:31 +0000 (16:44 -0800)]
am
efe10233: am
5dcb75e6: Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
* commit '
efe102332861bd05f0cba60e729661607546de34':
fix typos bug:
11693951 bug:
12118617
Scott Main [Wed, 18 Dec 2013 00:41:23 +0000 (00:41 +0000)]
am
5dcb75e6: Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
* commit '
5dcb75e67b7a3401aa501126bc8401f78c181a68':
fix typos bug:
11693951 bug:
12118617
Scott Main [Wed, 18 Dec 2013 00:38:30 +0000 (00:38 +0000)]
Merge "fix typos bug:
11693951 bug:
12118617" into klp-docs
Scott Main [Tue, 17 Dec 2013 23:12:13 +0000 (23:12 +0000)]
am
22591164: am
007ae376: am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
2259116450f25ae75d8d142a2bf15f3d5db35bd6':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:08:37 +0000 (23:08 +0000)]
am
007ae376: am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
007ae376d7672a456213e7f5475de4a910594cb2':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:06:31 +0000 (15:06 -0800)]
am
8c95a149: am
5b50239c: fix sidenav links to use toroot variable
* commit '
8c95a149b516595e22fa7b6479d7bc02750531c2':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 23:03:49 +0000 (23:03 +0000)]
am
5b50239c: fix sidenav links to use toroot variable
* commit '
5b50239c33176e0b321d2ee32a589e0583767e02':
fix sidenav links to use toroot variable
Scott Main [Tue, 17 Dec 2013 22:59:05 +0000 (14:59 -0800)]
fix sidenav links to use toroot variable
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
Scott Main [Tue, 17 Dec 2013 22:06:38 +0000 (22:06 +0000)]
am
dd55de3d: am
9767f9e2: am
7df86ef4: am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-d
* commit '
dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 22:03:16 +0000 (22:03 +0000)]
am
9767f9e2: am
7df86ef4: am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
* commit '
9767f9e2120609ada992e558ba16608aafa96811':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 22:00:45 +0000 (14:00 -0800)]
am
7df86ef4: am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
* commit '
7df86ef441835aedf24477f61e12cf78c5a86244':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 21:57:46 +0000 (21:57 +0000)]
am
9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
* commit '
9e36f588993e02210f02d9b7c0600a842d67bbdb':
update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502
Scott Main [Tue, 17 Dec 2013 21:47:55 +0000 (13:47 -0800)]
fix typos
bug:
11693951
bug:
12118617
Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
Scott Main [Tue, 17 Dec 2013 21:54:48 +0000 (21:54 +0000)]
Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug:
11907502" into klp-docs
Dirk Dougherty [Tue, 17 Dec 2013 21:53:09 +0000 (21:53 +0000)]
am
bfc22ba2: am
4ffa6a4a: am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
bfc22ba251ae5eba7ce68d5a8281042519c187a0':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:50:46 +0000 (21:50 +0000)]
am
4ffa6a4a: am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
4ffa6a4ae930f724d2e16e85110892db9bb6280e':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:45:32 +0000 (13:45 -0800)]
am
d994602f: am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
d994602f99827adc589946453ab58551e31f878e':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:37:19 +0000 (21:37 +0000)]
am
731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
* commit '
731ba04536a07582904b4bf64a9eed896cb93bc5':
Doc change: update list of tablets supported in Google Play for Education.
Dirk Dougherty [Tue, 17 Dec 2013 21:34:57 +0000 (21:34 +0000)]
Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
Scott Main [Tue, 17 Dec 2013 21:29:00 +0000 (21:29 +0000)]
am
64d14b5c: am
37826fa9: am
4e73847a: am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree
* commit '
64d14b5cd9c548b313da1a9b211c3ea02deb753d':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Tue, 17 Dec 2013 21:25:57 +0000 (21:25 +0000)]
am
37826fa9: am
4e73847a: am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Re
* commit '
37826fa9a973463d5698cbdaa4c844c981804459':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Tue, 17 Dec 2013 21:21:36 +0000 (13:21 -0800)]
am
4e73847a: am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above
* commit '
4e73847ab0d2278c314f67496b896d4de8c7abdb':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Tue, 17 Dec 2013 21:19:42 +0000 (21:19 +0000)]
am
5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perf
* commit '
5cdadb48d0e696352c21794861ba533214b06318':
initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
Scott Main [Wed, 6 Nov 2013 02:29:52 +0000 (18:29 -0800)]
initial shuffle of the API guide nav to add introduction
* revise to the Compatibility doc, put it in Intro
* put Permissions in Intro
* put App Fundamentals in Intro
* move Manifest docs to the top of side nav tree
* move App Resources above UI
Will perform another fix to the Best Practices section
later to deprecate some docs there and point to Training instead
Change-Id: I88a8f94167ba15e97eb3bbbc08fd82dd82498e4b
Dirk Dougherty [Tue, 17 Dec 2013 20:46:40 +0000 (12:46 -0800)]
Doc change: update list of tablets supported in Google Play for Education.
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
Greg Hackmann [Tue, 17 Dec 2013 20:08:26 +0000 (20:08 +0000)]
am
1877f7dc: am
0b64fa7e: am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
1877f7dc58d28146bd1907352cb46dbc95302cbb':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 19:56:22 +0000 (11:56 -0800)]
resolved conflicts for merge of
08579921 to klp-modular-dev
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
Greg Hackmann [Tue, 17 Dec 2013 18:22:24 +0000 (18:22 +0000)]
am
153ec6ca: am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
153ec6cae7db2053c71541af8973244f0dbf6d4a':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:19:09 +0000 (18:19 +0000)]
am
0b64fa7e: am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
0b64fa7e4b51f1ec96abf49abdc84e2a4c1b4294':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 18:19:04 +0000 (18:19 +0000)]
am
060ae1db: am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
060ae1db7bba39cb8171f4267b5de9538f1ab440':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:18:58 +0000 (18:18 +0000)]
am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
3545433d052769417dcdd70bc59fbf31f9925ba4':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:15:37 +0000 (10:15 -0800)]
am
c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '
c978799c4a7cc8339d560bb47a029861230fa2a6':
Add /dev/rtc backend to SystemClock
Greg Hackmann [Tue, 17 Dec 2013 18:15:33 +0000 (10:15 -0800)]
am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:15:29 +0000 (10:15 -0800)]
am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:11:06 +0000 (18:11 +0000)]
Merge "Add /dev/rtc backend to SystemClock"
Greg Hackmann [Tue, 17 Dec 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Add timerfd backend to AlarmManagerService"
Greg Hackmann [Tue, 17 Dec 2013 18:10:32 +0000 (18:10 +0000)]
Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
Craig Mautner [Tue, 17 Dec 2013 16:48:46 +0000 (16:48 +0000)]
am
38bcf6dc: am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
38bcf6dc8784625eb4b68634450c578719346669':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:45:06 +0000 (16:45 +0000)]
am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
422d7003db8d26b5fa503aa294348d7b53621db1':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:42:31 +0000 (08:42 -0800)]
am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
f431daa22811fdce9c4ec975d5d33121898b4f9b':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.
TaskRecord task may be set to null when no resumed activity remain.
Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.
The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.
Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.
To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.
Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.
Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
Scott Main [Tue, 17 Dec 2013 02:50:20 +0000 (02:50 +0000)]
am
a759b3d2: am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
a759b3d2b4c822a735a3a023be9b484cc05e0b19':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:47:50 +0000 (02:47 +0000)]
am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
3fca61f073b89136396022d78f444d0a50c1a0d3':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:45:00 +0000 (18:45 -0800)]
am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
75b8b3e008589c0a02c27d5baa6b3314a020f505':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:06:05 +0000 (02:06 +0000)]
am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:03:40 +0000 (02:03 +0000)]
Merge "add new training course for Interaction and Engagement" into klp-docs
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Greg Hackmann [Thu, 12 Dec 2013 02:00:34 +0000 (18:00 -0800)]
Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).
Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Tue, 10 Dec 2013 00:56:53 +0000 (16:56 -0800)]
Add timerfd backend to AlarmManagerService
On devices without /dev/alarm, use a new backend based on timerfd.
timerfd has near-equivalent syscalls for the /dev/alarm ioctls we care
about, with two key differences:
1) /dev/alarm uses one fd for all clocks, while timerfd needs one fd per
clock type.
AlarmManagerService addresses this by replacing the fd (int) with an
opaque pointer (long) to the backend-specific state.
2) When the RTC changes, the /dev/alarm WAIT ioctl always returns, while
timerfd cancels (and signals events) only on specially-flagged RTC
timerfds.
The timerfd backend masks this by creating an extraneous RTC timerfd,
specifically so there's always something to signal on RTC changes.
Change-Id: I5aef867748298610347f6e1479dd8bf569495832
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Trevor Johns [Mon, 16 Dec 2013 23:05:48 +0000 (23:05 +0000)]
am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 23:02:44 +0000 (23:02 +0000)]
am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
ed8d921a2e8feae859bb1899356a936eb84fe50f':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:59:19 +0000 (14:59 -0800)]
am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
eec66178668d22910d3889e62087b3797ebf6dd2':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:56:38 +0000 (22:56 +0000)]
am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
73c1681b2f557dfba09a2e1a071dec190dd05e36':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:43:47 +0000 (22:43 +0000)]
Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Fri, 13 Dec 2013 04:09:14 +0000 (20:09 -0800)]
Docs: Clean up HCE dev guide
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.
Issue:
11991294
Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
Scott Main [Mon, 16 Dec 2013 21:38:11 +0000 (21:38 +0000)]
Scott Main [Mon, 16 Dec 2013 21:34:58 +0000 (21:34 +0000)]
Scott Main [Mon, 16 Dec 2013 21:31:45 +0000 (13:31 -0800)]
Scott Main [Mon, 16 Dec 2013 21:29:18 +0000 (21:29 +0000)]
Scott Main [Mon, 16 Dec 2013 21:22:08 +0000 (13:22 -0800)]
fix typo
bug:
12174614
Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
Scott Main [Tue, 10 Dec 2013 02:02:48 +0000 (18:02 -0800)]
add new training course for Interaction and Engagement
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
Elliott Hughes [Mon, 16 Dec 2013 21:07:24 +0000 (21:07 +0000)]
am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:04:50 +0000 (21:04 +0000)]
am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
a012fee3c31803799176f3efb75cf2f929eeb062':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:01:19 +0000 (13:01 -0800)]
am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
5d6332e3744e37ced079e5360f1fa3e0e5681d57':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 20:58:11 +0000 (20:58 +0000)]
am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
4275cae4084cff0e267d9e0d63b968aa0788909a':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Christopher Tate [Mon, 16 Dec 2013 20:52:13 +0000 (20:52 +0000)]
am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
e998b6076532daaa9c2c621a09a04d67a75a5ad0':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:49:55 +0000 (12:49 -0800)]
am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
6040bd47f41fd56ee608f6a80a0babe942ea1df3':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Nick Kralevich [Mon, 16 Dec 2013 18:44:04 +0000 (18:44 +0000)]
am
fbd6d5a8: am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Nick Kralevich [Mon, 16 Dec 2013 18:41:03 +0000 (18:41 +0000)]
am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
09fdc159552c85032ce9860fc0d63b6eebeca82a':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Katie McCormick [Mon, 16 Dec 2013 18:36:41 +0000 (18:36 +0000)]
am
c4927389: am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c49273895ea96da5d88c806fb6acd4a92b963f84':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:36:39 +0000 (10:36 -0800)]
am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Katie McCormick [Mon, 16 Dec 2013 18:33:42 +0000 (18:33 +0000)]
am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
1e609ac45df13fed93df81e805ea6d6485da3aa0':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:29:57 +0000 (10:29 -0800)]
am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Katie McCormick [Mon, 16 Dec 2013 18:28:00 +0000 (18:28 +0000)]
am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:25:12 +0000 (18:25 +0000)]
Merge "Doc update: clarify version of flags." into klp-docs
Narayan Kamath [Mon, 16 Dec 2013 15:26:41 +0000 (15:26 +0000)]
am
8f90e476: am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
8f90e47694b441941fdf5f17fcb9927ec23fb50b':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:23:50 +0000 (15:23 +0000)]
am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
28635ca3e3815ca01417ef03dd9debd938e34307':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:20:26 +0000 (07:20 -0800)]
am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
44291d9c2722e0d22dc6f909585f4302abdce205':
Use StrictJarFile instead of JarFile for cert collection.
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.
Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
In commit
08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
- CONFIG_MCC = 0x0001,
- CONFIG_MNC = 0x0002,
+ CONFIG_MCC = ACONFIGURATION_MCC,
+ CONFIG_MNC = ACONFIGURATION_MCC,
This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.
Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Jesse Hall [Sun, 15 Dec 2013 00:22:37 +0000 (00:22 +0000)]
am
97b3e43f: am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
97b3e43ff108cb4761450732fc02e4b69502b8a0':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:20:11 +0000 (00:20 +0000)]
am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
e2e15d6da1936890117ad21fb6b18cce321c7d2b':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:16:24 +0000 (16:16 -0800)]
am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
a0ab49bb52f44eac97f81117d6864edd6a2e0487':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fix incorrect name in eglSwapBuffers log wrapper"
OSDN Git Service
