OSDN Git Service
Benjamin Franz [Thu, 12 Feb 2015 17:02:09 +0000 (17:02 +0000)]
am
dd0027cf: am
40ab8bb2: am
c70d0e71: Fix the javadocs for lock task mode intents.
* commit '
dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
Fix the javadocs for lock task mode intents.
Benjamin Franz [Thu, 12 Feb 2015 16:52:34 +0000 (16:52 +0000)]
am
40ab8bb2: am
c70d0e71: Fix the javadocs for lock task mode intents.
* commit '
40ab8bb22979b9e7c76e016b861319f6103eb800':
Fix the javadocs for lock task mode intents.
Benjamin Franz [Thu, 12 Feb 2015 16:45:06 +0000 (16:45 +0000)]
am
c70d0e71: Fix the javadocs for lock task mode intents.
* commit '
c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
Narayan Kamath [Thu, 12 Feb 2015 16:41:41 +0000 (16:41 +0000)]
am
c7e48719: Merge "Remove references to persist.sys.language/country."
automerge:
8be3724
* commit '
8be3724a06f7b2d28c6664ca11a03f91f97f0972':
Remove references to persist.sys.language/country.
Narayan Kamath [Thu, 12 Feb 2015 16:37:58 +0000 (16:37 +0000)]
am
c7e48719: Merge "Remove references to persist.sys.language/country."
* commit '
c7e487193aed3b102d6e55e0817de6e0460e0236':
Remove references to persist.sys.language/country.
Narayan Kamath [Thu, 12 Feb 2015 16:31:07 +0000 (16:31 +0000)]
Merge "Remove references to persist.sys.language/country."
Benjamin Franz [Thu, 12 Feb 2015 16:12:58 +0000 (16:12 +0000)]
Fix the javadocs for lock task mode intents.
Bug:
19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
Narayan Kamath [Thu, 12 Feb 2015 12:57:17 +0000 (12:57 +0000)]
Remove references to persist.sys.language/country.
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.
bug:
17691569
Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
Neil Fuller [Thu, 12 Feb 2015 10:00:41 +0000 (10:00 +0000)]
Merge "Remove usages of FloatMath" automerge:
a8e8cdb
automerge:
27316a9
* commit '
27316a93e5979859ae98f506eca365784353007a':
Remove usages of FloatMath
Neil Fuller [Thu, 12 Feb 2015 09:57:57 +0000 (09:57 +0000)]
Merge "Remove usages of FloatMath"
automerge:
a8e8cdb
* commit '
a8e8cdbb17164c0124e04c376110637af96d5e89':
Remove usages of FloatMath
Neil Fuller [Thu, 12 Feb 2015 09:26:47 +0000 (09:26 +0000)]
Merge "Remove usages of FloatMath"
Neil Fuller [Wed, 11 Feb 2015 15:49:47 +0000 (15:49 +0000)]
Remove usages of FloatMath
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
Tao Bao [Thu, 12 Feb 2015 06:32:05 +0000 (22:32 -0800)]
resolved conflicts for merge of
e1e1cd9d to lmp-mr1-dev-plus-aosp
Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1
Eino-Ville Talvala [Thu, 12 Feb 2015 05:54:34 +0000 (05:54 +0000)]
am
f5d30463: am
4fa3a80b: am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit '
f5d304636d27ea300c092fac0f0214170a89ba39':
Legacy: Only set user surface dimensions on output surfaces
Eino-Ville Talvala [Thu, 12 Feb 2015 05:48:50 +0000 (05:48 +0000)]
am
4fa3a80b: am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit '
4fa3a80b6cefdc500de6c7daacc7ef3e160a0543':
Legacy: Only set user surface dimensions on output surfaces
Eino-Ville Talvala [Thu, 12 Feb 2015 05:39:05 +0000 (05:39 +0000)]
am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit '
a5f301c7fb048461197a6032f66b35772a3157f9':
Legacy: Only set user surface dimensions on output surfaces
Eino-Ville Talvala [Thu, 12 Feb 2015 05:33:27 +0000 (05:33 +0000)]
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Tao Bao [Thu, 12 Feb 2015 04:39:01 +0000 (04:39 +0000)]
am
d884c63c: Merge "Use ICU for relative time formatting"
* commit '
d884c63c100ecc9e96fa55de5110f7034ba9cc03':
Use ICU for relative time formatting
Tao Bao [Thu, 12 Feb 2015 04:30:43 +0000 (04:30 +0000)]
Merge "Use ICU for relative time formatting"
Lorenzo Colitti [Thu, 12 Feb 2015 03:09:57 +0000 (03:09 +0000)]
am
b0dfaad8: am
f99551d8: am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit '
b0dfaad8c2a02c33885e6a278c7901da69d8ab49':
Make reportInetCondition revalidate if the report differs from our state
Lorenzo Colitti [Thu, 12 Feb 2015 02:56:56 +0000 (02:56 +0000)]
am
f99551d8: am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit '
f99551d8a149c1a80dddd6350efcfbd53d58e151':
Make reportInetCondition revalidate if the report differs from our state
Lorenzo Colitti [Thu, 12 Feb 2015 02:43:03 +0000 (02:43 +0000)]
am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit '
c7ccc393b470220710f566d447412d93f7f8d21b':
Make reportInetCondition revalidate if the report differs from our state
Adam Powell [Thu, 12 Feb 2015 02:34:42 +0000 (02:34 +0000)]
am
97e0ba69: am
b73e029f: am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '
97e0ba691222d037c1820ca8338ad13d07221daf':
Add DENSITY_280
Lorenzo Colitti [Thu, 12 Feb 2015 02:30:55 +0000 (02:30 +0000)]
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Adam Powell [Thu, 12 Feb 2015 02:25:29 +0000 (02:25 +0000)]
am
b73e029f: am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '
b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
Add DENSITY_280
Adam Powell [Thu, 12 Feb 2015 02:13:03 +0000 (02:13 +0000)]
am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '
0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
Adam Powell [Thu, 12 Feb 2015 02:08:03 +0000 (02:08 +0000)]
Merge "Add DENSITY_280" into lmp-mr1-dev
Tao Bao [Fri, 6 Feb 2015 23:44:00 +0000 (15:44 -0800)]
Use ICU for relative time formatting
Rewrite the DateUtils' relative time formatting APIs
(getRelativeTimeSpanString, getRelativeDateTimeString) to use ICU ones.
Two APIs that take withPreposition parameter are not changed. Because
(a) ICU doesn't provide functionality to format preposition; (b) They
are not really computing relative time but instead calling
formatDateRange() to get the absolute time/date string.
Bug:
19146457
Bug:
5252772
Change-Id: Iea8d699d63cc4438513910da66d038912e44fb8d
Eino-Ville Talvala [Wed, 11 Feb 2015 23:41:12 +0000 (15:41 -0800)]
Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.
Bug:
16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
Craig Mautner [Wed, 11 Feb 2015 23:04:12 +0000 (23:04 +0000)]
am
18d836b6: Merge "Don\'t relayout based on a window that isn\'t visible" into lmp-mr1-modular-dev
* commit '
18d836b61811270bfae8cec6e0e782234dfcf5a4':
Don't relayout based on a window that isn't visible
Craig Mautner [Wed, 11 Feb 2015 22:27:03 +0000 (22:27 +0000)]
Merge "Don't relayout based on a window that isn't visible" into lmp-mr1-modular-dev
Adam Powell [Wed, 11 Feb 2015 21:34:43 +0000 (13:34 -0800)]
Add DENSITY_280
Bug
19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
Craig Mautner [Wed, 11 Feb 2015 21:24:19 +0000 (13:24 -0800)]
Don't relayout based on a window that isn't visible
The method commitFinishDrawingLocked returned true even if the window
it was called for was hidden. By returning the value that
performShowLocked() returns it only returns true if the window is
shown.
Fixes bug
19100757.
Change-Id: I45df70aedcb3909561fd3a19e861579a11521db9
Alex Klyubin [Wed, 11 Feb 2015 20:37:12 +0000 (12:37 -0800)]
resolved conflicts for merge of
517e0274 to lmp-mr1-dev-plus-aosp
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
Michael Wright [Wed, 11 Feb 2015 19:59:16 +0000 (19:59 +0000)]
am
33bb70d6: am
40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge:
3292c0e
* commit '
33bb70d613cf8ed4664c4cc4047ae67f98599b32':
Michael Wright [Wed, 11 Feb 2015 19:50:56 +0000 (19:50 +0000)]
am
40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge:
3292c0e
* commit '
40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
Stop active media projections on user switch.
Alex Klyubin [Wed, 11 Feb 2015 19:34:30 +0000 (19:34 +0000)]
Merge "Move hidden ApplicationInfo flags into a separate field."
automerge:
1a24bb5
* commit '
1a24bb597aeb1b019d55988b574e5db1b0e4232c':
Move hidden ApplicationInfo flags into a separate field.
Alex Klyubin [Wed, 11 Feb 2015 19:27:14 +0000 (19:27 +0000)]
Merge "Move hidden ApplicationInfo flags into a separate field."
Alex Klyubin [Tue, 3 Feb 2015 19:12:59 +0000 (11:12 -0800)]
Move hidden ApplicationInfo flags into a separate field.
The public API field android.content.pm.ApplicationInfo.flags can
support only 32 flags. This limit has been reached. As a short term
workaround to enable new public flags to be added, this CL moves flags
which are not public API into a separate new field privateFlags and
renames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED
is now PRIVATE_FLAG_PRIVILEGED).
The new privateFlags field is not public API and should not be used
for flags that are public API.
The flags that are moved out of ApplicationInfo.flags are:
* FLAG_HIDDEN,
* FLAG_CANT_SAVE_STATE,
* FLAG_FORWARD_LOCK, and
* FLAG_PRIVILEGED.
NOTE: This changes the format of packages.xml. Prior to this CL flags
were stored in the "flags" attribute. With this CL, the public flags
are stored in a new "publicFlags" attribute and private flags are
stored in a new "privateFlags" attribute. The old "flags" attribute
is interpreted by using the old values of hidden/private flags.
Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5
Michael Wright [Wed, 11 Feb 2015 18:43:29 +0000 (18:43 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge:
3292c0e
automerge:
40bd8f4
* commit '
40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
Stop active media projections on user switch.
Michael Wright [Wed, 11 Feb 2015 18:33:00 +0000 (18:33 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
automerge:
3292c0e
* commit '
3292c0e2640667e5ef78896653a41c85e7de06c5':
Stop active media projections on user switch.
Michael Wright [Wed, 11 Feb 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
Pirama Arumuga Nainar [Wed, 11 Feb 2015 17:15:47 +0000 (17:15 +0000)]
Merge "Store compiled code in Context.getCodeCacheDir()" automerge:
3fbbe39
automerge:
1641e19
* commit '
1641e192a82e266159e0b82078a8f98ebcd3d8ff':
Store compiled code in Context.getCodeCacheDir()
Pirama Arumuga Nainar [Wed, 11 Feb 2015 17:11:06 +0000 (17:11 +0000)]
Merge "Store compiled code in Context.getCodeCacheDir()"
automerge:
3fbbe39
* commit '
3fbbe396faffeec6b46796087ad1e075e9a21f0d':
Store compiled code in Context.getCodeCacheDir()
Pirama Arumuga Nainar [Wed, 11 Feb 2015 17:08:00 +0000 (17:08 +0000)]
Merge "Store compiled code in Context.getCodeCacheDir()"
Jeff Davidson [Wed, 11 Feb 2015 08:44:38 +0000 (08:44 +0000)]
am
5d8a31c4: am
46dbb5be: am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
5d8a31c46c947c2c5f56669c00e6c8aea31c47f7':
Jeff Davidson [Wed, 11 Feb 2015 08:38:35 +0000 (08:38 +0000)]
am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
automerge:
46dbb5b
* commit '
46dbb5be4c56e8af603514a3cf2bd7daf0191724':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Jeff Davidson [Wed, 11 Feb 2015 08:37:30 +0000 (08:37 +0000)]
am
46dbb5be: am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
46dbb5be4c56e8af603514a3cf2bd7daf0191724':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Jeff Davidson [Wed, 11 Feb 2015 08:30:44 +0000 (08:30 +0000)]
am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
50996a12a8e859346d5eb3c4569c4e81c9b52a05':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Jeff Davidson [Wed, 11 Feb 2015 08:25:26 +0000 (08:25 +0000)]
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Jeff Davidson [Tue, 10 Feb 2015 18:02:11 +0000 (10:02 -0800)]
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.
Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.
Bug:
19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
Lorenzo Colitti [Wed, 11 Feb 2015 07:39:23 +0000 (07:39 +0000)]
am
e1507ac5: am
00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge:
c38b90b
* commit '
e1507ac506a4dac327a5cbabede0384836659de0':
Lorenzo Colitti [Wed, 11 Feb 2015 07:33:10 +0000 (07:33 +0000)]
am
00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge:
c38b90b
* commit '
00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
Lorenzo Colitti [Wed, 11 Feb 2015 07:32:53 +0000 (07:32 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge:
c38b90b
automerge:
00c8450
* commit '
00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
Lorenzo Colitti [Wed, 11 Feb 2015 07:24:50 +0000 (07:24 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
automerge:
c38b90b
* commit '
c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4':
Make getNetworkInfo() take into account VPN underlying networks.
Lorenzo Colitti [Wed, 11 Feb 2015 07:18:16 +0000 (07:18 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
Shishir Agrawal [Wed, 11 Feb 2015 06:28:28 +0000 (06:28 +0000)]
am
c54a87e3: am
6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge:
64ce5f8
* commit '
c54a87e302a2a28b16864f71b9db57241d68ca48':
Shishir Agrawal [Wed, 11 Feb 2015 03:44:42 +0000 (03:44 +0000)]
GpsLocationProvider: Read data enabled status from TelephonyManager. automerge:
64ce5f8
automerge:
6b27472
* commit '
6b274720c5a210c07256e5b9fc11a1e9aca59017':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Wed, 11 Feb 2015 03:41:38 +0000 (03:41 +0000)]
am
6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge:
64ce5f8
* commit '
6b274720c5a210c07256e5b9fc11a1e9aca59017':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Wed, 11 Feb 2015 03:35:42 +0000 (03:35 +0000)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
automerge:
64ce5f8
* commit '
64ce5f8fab077e4792737f86502d0e77ad6cbb0b':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Wed, 11 Feb 2015 03:02:38 +0000 (19:02 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
Lorenzo Colitti [Tue, 10 Feb 2015 22:39:20 +0000 (07:39 +0900)]
Make reportInetCondition revalidate if the report differs from our state
1. If reportInetCondition says the network is not working, and
the network is already marked not validated, don't revalidate
it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
network is not marked as validated, revalidated. This will
allow us to get out of a validated state quickly based on app
input (e.g., allowing GCM's exponential backoff timer to drive
revalidation instead of our 10-minute timer).
Bug:
19258761
Bug:
19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
Lorenzo Colitti [Thu, 5 Feb 2015 04:57:17 +0000 (13:57 +0900)]
Make getNetworkInfo() take into account VPN underlying networks.
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug:
19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
Nick Vaccaro [Wed, 11 Feb 2015 00:20:52 +0000 (00:20 +0000)]
am
d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
* commit '
d0d13d822cdec4fa7214d1495137064c28ecc07e':
Update API to contain new wrist tilt sensor type and string.
Nick Vaccaro [Wed, 11 Feb 2015 00:15:15 +0000 (00:15 +0000)]
Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
Marco Nelissen [Wed, 11 Feb 2015 00:00:57 +0000 (00:00 +0000)]
am
6da3cc59: am
396f131d: Merge "Fix memory leak"
* commit '
6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
Fix memory leak
Marco Nelissen [Tue, 10 Feb 2015 23:54:48 +0000 (23:54 +0000)]
am
396f131d: Merge "Fix memory leak"
* commit '
396f131de7646faacd74ec3be11c4861bb233872':
Fix memory leak
Marco Nelissen [Tue, 10 Feb 2015 23:46:27 +0000 (23:46 +0000)]
Merge "Fix memory leak"
Marco Nelissen [Tue, 10 Feb 2015 23:45:23 +0000 (15:45 -0800)]
Fix memory leak
Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
Leon Scroggins III [Tue, 10 Feb 2015 23:21:41 +0000 (23:21 +0000)]
am
7aa7f841: am
dc77ec59: am
3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
* commit '
7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c':
Shanea King-Roberson [Tue, 10 Feb 2015 23:21:27 +0000 (23:21 +0000)]
am
f9259107: am
accf0770: am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge:
696b68c
* commit '
f9259107342559456105392e3387a3c8a1e5d6e4':
Chris Warrington [Tue, 10 Feb 2015 23:21:08 +0000 (23:21 +0000)]
am
8ddf335a: am
44998887: am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
* commit '
8ddf335a01cb9e83ceadd314739899895c84f0e1':
Luan Nguyen [Tue, 10 Feb 2015 23:21:00 +0000 (23:21 +0000)]
am
61dc64f3: am
6ee90183: am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
61dc64f38b2669a9e1599bc5595b760f31f586f7':
Eric Gilmore [Tue, 10 Feb 2015 23:20:19 +0000 (23:20 +0000)]
am
7372d2d1: am
2b7f0cff: am
f35e8159: am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge:
2b36779
* commit '
7372d2d1db3b56c2f6592c15a29d7c2fb00ccd1c':
John Spurlock [Tue, 10 Feb 2015 23:19:54 +0000 (23:19 +0000)]
Leon Scroggins III [Tue, 10 Feb 2015 22:21:09 +0000 (22:21 +0000)]
am
3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
automerge:
dc77ec5 -s ours
* commit '
dc77ec59beb23a2ff300d5048633687c0d68a0ac':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Tue, 10 Feb 2015 22:13:43 +0000 (22:13 +0000)]
am
dc77ec59: am
3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
* commit '
dc77ec59beb23a2ff300d5048633687c0d68a0ac':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Tue, 10 Feb 2015 22:08:00 +0000 (22:08 +0000)]
am
3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
* commit '
3bb5fdc7e607febaad3bd41ed7a36b596b7286af':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Tue, 10 Feb 2015 22:03:43 +0000 (22:03 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
Pirama Arumuga Nainar [Tue, 10 Feb 2015 20:41:42 +0000 (12:41 -0800)]
Store compiled code in Context.getCodeCacheDir()
bug
16345623
Use Context.getCodeCacheDir for EGL shader cache and RenderScript
compiled code.
Change-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734
Leon Scroggins III [Mon, 9 Feb 2015 20:42:19 +0000 (15:42 -0500)]
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
BUG:
19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
Shanea King-Roberson [Tue, 10 Feb 2015 20:50:57 +0000 (20:50 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge:
696b68c
automerge:
accf077
* commit '
accf0770306419773c3119eb32ca912077894b11':
Adding videos for 5.0 changes and watch face development.
Nick Vaccaro [Fri, 23 Jan 2015 23:09:45 +0000 (15:09 -0800)]
Update API to contain new wrist tilt sensor type and string.
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.
Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
Shanea King-Roberson [Tue, 10 Feb 2015 20:37:39 +0000 (20:37 +0000)]
am
accf0770: am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge:
696b68c
* commit '
accf0770306419773c3119eb32ca912077894b11':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:25:34 +0000 (20:25 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
automerge:
696b68c
* commit '
696b68c4fc65b671a00cfa82e6bc29a7d665828e':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:17:53 +0000 (20:17 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
Chris Warrington [Tue, 10 Feb 2015 20:14:44 +0000 (20:14 +0000)]
am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
automerge:
4499888
* commit '
449988872be61f273c91db13069d5b7172429032':
Fix AAPT daemon mode with paths containg spaces.
Shanea King-Roberson [Tue, 10 Feb 2015 20:10:38 +0000 (20:10 +0000)]
am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
3162289445ebade804c422162578d328c4762372':
Adding videos for 5.0 changes and watch face development.
Chris Warrington [Tue, 10 Feb 2015 20:07:28 +0000 (20:07 +0000)]
am
44998887: am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
* commit '
449988872be61f273c91db13069d5b7172429032':
Fix AAPT daemon mode with paths containg spaces.
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
Chris Warrington [Tue, 10 Feb 2015 20:01:00 +0000 (20:01 +0000)]
am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
* commit '
510c24e8930447811f6725cbf7f3cefec2194a5d':
Fix AAPT daemon mode with paths containg spaces.
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Chris Warrington [Tue, 10 Feb 2015 19:56:31 +0000 (19:56 +0000)]
Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
Luan Nguyen [Tue, 10 Feb 2015 19:18:37 +0000 (19:18 +0000)]
am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
automerge:
6ee9018
* commit '
6ee90183ab79f9c3b5216a9b0b6518de7679734a':
docs: Fix various issues with incorrect code samples.
Eric Gilmore [Tue, 10 Feb 2015 19:16:49 +0000 (19:16 +0000)]
am
f35e8159: am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge:
2b36779
automerge:
2b7f0cf
* commit '
2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
Doc change: refactor GCM docs to be platform-agnostic.
Luan Nguyen [Tue, 10 Feb 2015 19:09:14 +0000 (19:09 +0000)]
am
6ee90183: am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
6ee90183ab79f9c3b5216a9b0b6518de7679734a':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 19:02:50 +0000 (19:02 +0000)]
am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
18fc7b85543cd21317475962521606038cd44383':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:56:32 +0000 (18:56 +0000)]
am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:47:38 +0000 (18:47 +0000)]
am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
9b432bbece3cca6316b2638a947983e21c65917f':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.