OSDN Git Service
Chad Brubaker [Wed, 13 May 2015 18:15:43 +0000 (18:15 +0000)]
am
90c66e3d: Merge "Add keystore onUserAdded/Removed methods" into mnc-dev
* commit '
90c66e3ded4a91613b0c1760ab2ef15e0d118a36':
Add keystore onUserAdded/Removed methods
Chris Wren [Wed, 13 May 2015 18:15:39 +0000 (18:15 +0000)]
am
5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev
* commit '
5e4027fe258f92d2d8b1d181cd959086aa84ac15':
induct a bunch of new logging categories.
Chad Brubaker [Wed, 13 May 2015 18:09:57 +0000 (18:09 +0000)]
Merge "Add keystore onUserAdded/Removed methods" into mnc-dev
Chris Wren [Wed, 13 May 2015 18:05:54 +0000 (18:05 +0000)]
Merge "induct a bunch of new logging categories." into mnc-dev
Alan Viverette [Wed, 13 May 2015 17:57:59 +0000 (17:57 +0000)]
am
876677ef: Merge "Strip PNG metadata" into mnc-dev
* commit '
876677ef2d04545593fd4cd7bb8539fa15e3dc09':
Strip PNG metadata
Jonathan Basseri [Wed, 13 May 2015 17:57:54 +0000 (17:57 +0000)]
am
c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
* commit '
c69cd0bf7586c57f9662955d798a2ae0eef6ee76':
Switching to PersistableBundle in carrier config API.
Nicolas Prevot [Wed, 13 May 2015 17:57:50 +0000 (17:57 +0000)]
am
22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
* commit '
22fec2201f01222d61c84f536289fd1e8bb5a03f':
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
Chad Brubaker [Tue, 12 May 2015 20:00:02 +0000 (13:00 -0700)]
Add keystore onUserAdded/Removed methods
(cherry-picked from commit
31c2897105e6d71f8e6edeab312d2147bbdbaeb1)
Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
Alan Viverette [Wed, 13 May 2015 17:53:13 +0000 (17:53 +0000)]
Merge "Strip PNG metadata" into mnc-dev
Jonathan Basseri [Wed, 13 May 2015 17:46:29 +0000 (17:46 +0000)]
Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
Nicolas Prevot [Wed, 13 May 2015 17:46:04 +0000 (17:46 +0000)]
Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
Jonathan Basseri [Tue, 12 May 2015 17:06:32 +0000 (10:06 -0700)]
Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.
In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.
Bug:
20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
Mady Mellor [Wed, 13 May 2015 17:38:56 +0000 (17:38 +0000)]
am
21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
* commit '
21623faa449496d68bd102ddda5874f572b9c55a':
Fix issue where handle is in front of word rather than end of word
Dan Sandler [Wed, 13 May 2015 17:38:47 +0000 (17:38 +0000)]
am
b27333bc: Merge "Icon API tuneups:" into mnc-dev
* commit '
b27333bcca733ec0ec828b45d20507cbfa13c6d6':
Icon API tuneups:
Joe LaPenna [Wed, 13 May 2015 17:38:43 +0000 (17:38 +0000)]
am
4201be08: am
37d0c94f: (-s ours) am
0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev
* commit '
4201be08a1cb1358e7ee30f81927b7c11f477ea3':
Reduce display device log spam.
Chris Wren [Wed, 13 May 2015 17:37:42 +0000 (13:37 -0400)]
induct a bunch of new logging categories.
Bug:
20264417
Change-Id: Ica85a31016592be87f727c0d86a4be59eb854158
Mady Mellor [Wed, 13 May 2015 17:34:12 +0000 (17:34 +0000)]
Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
Dan Sandler [Wed, 13 May 2015 17:32:16 +0000 (17:32 +0000)]
Merge "Icon API tuneups:" into mnc-dev
Joe LaPenna [Wed, 13 May 2015 17:25:07 +0000 (17:25 +0000)]
am
37d0c94f: (-s ours) am
0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev
* commit '
37d0c94f7a4a1e2ca31b5cbc269222ded7495ca0':
Reduce display device log spam.
Dan Sandler [Wed, 13 May 2015 14:51:52 +0000 (10:51 -0400)]
Icon API tuneups:
- Reorder parameters to loadDrawableAsync()
- New version of createWithResource that takes a package
name instead of a Resources
- Add loadDrawableAsUser() for INTERACT_ACROSS_USERS clients
like SystemUI
- Docs cleanups
Bug:
21089268
Bug:
21031774
Change-Id: I465d2b865e35e12094b564f994e59d55e522f65a
Wei Liu [Wed, 13 May 2015 17:07:37 +0000 (17:07 +0000)]
am
b9599750: Merge "resolved conflicts for merge of
f0c4f0dd to mnc-dev" into mnc-dev
* commit '
b9599750235985e92ed393bbbd0f59e31ec25b01':
Create GpsLocationProvider only if GPS is supported.
Geoff Mendal [Wed, 13 May 2015 17:01:36 +0000 (17:01 +0000)]
am
ec6e7a66: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ec6e7a662db44d32bb3c8676e7c9e87dea86075f':
Import translations. DO NOT MERGE
John Reck [Wed, 13 May 2015 17:01:28 +0000 (17:01 +0000)]
am
75e7d7eb: Merge "Unify DrawProfiler/JankStats" into mnc-dev
* commit '
75e7d7eb0e5dd0ffd3ebc234e10d885d1366281a':
Unify DrawProfiler/JankStats
Wei Liu [Wed, 13 May 2015 16:59:53 +0000 (16:59 +0000)]
Merge "resolved conflicts for merge of
f0c4f0dd to mnc-dev" into mnc-dev
Wei Liu [Wed, 13 May 2015 16:57:33 +0000 (09:57 -0700)]
resolved conflicts for merge of
f0c4f0dd to mnc-dev
Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3
Geoff Mendal [Wed, 13 May 2015 16:55:44 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Reck [Wed, 13 May 2015 16:30:03 +0000 (16:30 +0000)]
Merge "Unify DrawProfiler/JankStats" into mnc-dev
Paul McLean [Wed, 13 May 2015 16:27:56 +0000 (16:27 +0000)]
am
7b0e380b: Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev
* commit '
7b0e380bf04c076840ce7215f8dd95dc7e234a45':
API Council Change Phase 2 - add/remove callback
Paul McLean [Wed, 13 May 2015 16:18:59 +0000 (16:18 +0000)]
Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev
Stefan Kuhne [Wed, 13 May 2015 16:15:20 +0000 (16:15 +0000)]
am
4d893744: Merge "Ensure activity visiblity when moving task" into mnc-dev
* commit '
4d89374483c61c107a4ad758656cb76e46f7c5c5':
Ensure activity visiblity when moving task
John Spurlock [Wed, 13 May 2015 16:10:31 +0000 (16:10 +0000)]
am
e1d0188b: Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev
* commit '
e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3':
Zen: Map external ringer mode = silent to zen = alarms.
Clara Bayarri [Wed, 13 May 2015 16:10:27 +0000 (16:10 +0000)]
am
99bd704f: Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev
* commit '
99bd704f1c6bb4b818e6521ca41a70a2ec2245f4':
Fix Floating Toolbar appearing after ActionMode was cancelled
Yohei Yukawa [Wed, 13 May 2015 16:10:26 +0000 (16:10 +0000)]
am
05fe90c1: Merge "Show IME switcher also when hardware keyboard is connected." into mnc-dev
* commit '
05fe90c10b54111a742187935f2890029b348bf5':
Show IME switcher also when hardware keyboard is connected.
Tobias Sargeant [Wed, 13 May 2015 16:10:25 +0000 (16:10 +0000)]
am
a58fbec6: Merge "Update API." into mnc-dev
* commit '
a58fbec633bb6b4fa1afe03fc25d5e81235202e1':
Update API.
Jason Monk [Wed, 13 May 2015 16:10:25 +0000 (16:10 +0000)]
am
1c5a55e9: Merge "Fix crash from WPS" into mnc-dev
* commit '
1c5a55e997371e50deb543c0e491bdcc96e71b67':
Fix crash from WPS
Geoff Mendal [Wed, 13 May 2015 16:05:02 +0000 (09:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If88312e77d2b5b89b00097db2923a8953ac460ff
Auto-generated-cl: translation import
Stefan Kuhne [Wed, 13 May 2015 16:04:44 +0000 (16:04 +0000)]
Merge "Ensure activity visiblity when moving task" into mnc-dev
John Spurlock [Wed, 13 May 2015 15:49:31 +0000 (15:49 +0000)]
Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev
Clara Bayarri [Wed, 13 May 2015 15:46:57 +0000 (15:46 +0000)]
Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev
Yohei Yukawa [Wed, 13 May 2015 15:25:19 +0000 (15:25 +0000)]
Merge "Show IME switcher also when hardware keyboard is connected." into mnc-dev
John Spurlock [Wed, 13 May 2015 15:19:19 +0000 (11:19 -0400)]
Zen: Map external ringer mode = silent to zen = alarms.
Bug:
21109517
Change-Id: I0e9506dad05ce4edf709ee879367b9f6aeba8dfd
Tobias Sargeant [Wed, 13 May 2015 15:18:47 +0000 (15:18 +0000)]
Merge "Update API." into mnc-dev
Jason Monk [Wed, 13 May 2015 15:15:06 +0000 (15:15 +0000)]
Merge "Fix crash from WPS" into mnc-dev
John Spurlock [Wed, 13 May 2015 15:12:43 +0000 (15:12 +0000)]
am
5b32fa78: Merge "NoMan: Specify all users for noman broadcasts." into mnc-dev
* commit '
5b32fa78d30f44bcabd1695d2f5d1062ca1118d5':
NoMan: Specify all users for noman broadcasts.
Geoff Mendal [Wed, 13 May 2015 15:12:34 +0000 (15:12 +0000)]
am
6a3418e2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6a3418e2e1608a57244a9957b535148783b70a31':
Import translations. DO NOT MERGE
Brian Colonna [Wed, 13 May 2015 15:12:27 +0000 (15:12 +0000)]
am
9a61013d: Merge "Removed unused Face Unlock aidl files" into mnc-dev
* commit '
9a61013d2d0e4448b884a0869b80ea20da441691':
Removed unused Face Unlock aidl files
Tobias Sargeant [Wed, 13 May 2015 15:12:26 +0000 (16:12 +0100)]
Update API.
Bug:
21043955
Change-Id: Ibc012c1e60336f1f070982d27b8c75be8590dc5a
Erik Kline [Wed, 13 May 2015 15:12:19 +0000 (15:12 +0000)]
am
cf304fb3: Merge "Initial IpReachabilityMonitor implementation." into mnc-dev
* commit '
cf304fb35c2086601178858e307d3dda36dbbff7':
Initial IpReachabilityMonitor implementation.
Jason Monk [Wed, 13 May 2015 15:07:53 +0000 (11:07 -0400)]
Fix crash from WPS
Also fix the tests to handle the new threadedness while here.
Bug:
20067687
Change-Id: I116bf14c71886b251c2e8bcaeb2c9b0e5f9ec817
Clara Bayarri [Wed, 13 May 2015 14:12:12 +0000 (15:12 +0100)]
Fix Floating Toolbar appearing after ActionMode was cancelled
The Views created for the Toolbar were not cleaned up properly when the
mode was cancelled by the client in onCreateActionMode, leading to the
toolbar appearing over other views when it shouldn't due to
onWindowFocusChanged showing the Toolbar if it exists.
We don't actually need the views if we don't know whether they are
going to be shown yet, so moved view creation to after onCreateActionMode
Bug:
20713912
Change-Id: Ic0c31d1634e1e96d9981a77b2c769306a8bf1a8d
Paul McLean [Tue, 12 May 2015 22:36:56 +0000 (15:36 -0700)]
API Council Change Phase 2 - add/remove callback
Change-Id: Ic7d374c67ef46a2bc8427fa3555e3ad1a4b0723e
John Spurlock [Wed, 13 May 2015 14:54:00 +0000 (14:54 +0000)]
Merge "NoMan: Specify all users for noman broadcasts." into mnc-dev
John Spurlock [Wed, 13 May 2015 14:47:05 +0000 (10:47 -0400)]
NoMan: Specify all users for noman broadcasts.
Change-Id: I347bc25b09506dd5fd695e68f23e9654bab8103c
Geoff Mendal [Wed, 13 May 2015 14:13:23 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 13 May 2015 14:11:45 +0000 (07:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I931cdc19e6e7855a627c8bc139769ae06d1ecd2d
Auto-generated-cl: translation import
Stefan Kuhne [Tue, 12 May 2015 20:42:18 +0000 (13:42 -0700)]
Ensure activity visiblity when moving task
There was a visibility problem when multiple already running
activity got resized at the same time.
Only the last activity launched that got focus was shown and all others
were not.
The problem arose when a new ActivityStack got created and the
(existing) window got attached which led to the divergence of the
visibility states in different objects. The WindowState thinks
that it is visible, but the AppWindowToken thinks that it is not.
Subsequent calls to WindowState::ShowLw ignore calls to show the window
and the application logic enters the GONE state until it recieves focus.
Bug:
20692085
Change-Id: Ifc0e3686398ccd1d1ff32e1a266163b8db5b7f26
Brian Colonna [Wed, 13 May 2015 13:27:14 +0000 (13:27 +0000)]
Merge "Removed unused Face Unlock aidl files" into mnc-dev
Erik Kline [Wed, 13 May 2015 13:11:12 +0000 (13:11 +0000)]
Merge "Initial IpReachabilityMonitor implementation." into mnc-dev
Erik Kline [Thu, 7 May 2015 07:04:54 +0000 (16:04 +0900)]
Initial IpReachabilityMonitor implementation.
Add a class that monitors on-link IP reachability and notifies
callers whenever any on-link addresses of interest appear to have
become unresponsive.
Bug:
18581716
Change-Id: I333eee6fe30fa97a21297c6745de14ceb95bb661
Tobias Sargeant [Wed, 13 May 2015 11:41:55 +0000 (11:41 +0000)]
am
ebc45669: Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev
* commit '
ebc456691e15fb373130988687d3c70d76b97424':
Improve documentation and rename insertVisualStateCallback to postVisualStateCallback.
Tobias Sargeant [Wed, 13 May 2015 11:33:16 +0000 (11:33 +0000)]
Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev
Tobias Sargeant [Wed, 13 May 2015 10:23:57 +0000 (11:23 +0100)]
Improve documentation and rename insertVisualStateCallback to postVisualStateCallback.
Bug:
21043955
Change-Id: I077cad68fb519581387d1b474f27d43222f68e3b
Erik Kline [Wed, 13 May 2015 07:14:00 +0000 (07:14 +0000)]
am
5a5745b3: Merge "Add basic netlink library code." into mnc-dev
* commit '
5a5745b30cbd7049ab77154301b5eb112c1badc1':
Add basic netlink library code.
Erik Kline [Wed, 13 May 2015 07:04:58 +0000 (07:04 +0000)]
Merge "Add basic netlink library code." into mnc-dev
Lorenzo Colitti [Wed, 13 May 2015 06:40:06 +0000 (06:40 +0000)]
am
de803d3a: Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
* commit '
de803d3af55f52670f627105ea6f63598ef7cdf2':
Fix a race when removing from LegacyTypeTracker.
Lorenzo Colitti [Wed, 13 May 2015 06:31:36 +0000 (06:31 +0000)]
Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
Erik Kline [Tue, 20 Jan 2015 03:28:26 +0000 (12:28 +0900)]
Add basic netlink library code.
Add netlink socket helpers and parsing code for basic netlink messages.
Additionally, support from some neighbor discovery -specific messages
is included.
Bug:
18581716
Change-Id: Ib2aa924222b63cdbebf09a8bf8ff35ee24269fc5
Jeff Sharkey [Wed, 13 May 2015 05:37:43 +0000 (05:37 +0000)]
am
44b4add4: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
* commit '
44b4add4ce912ac2502082c6778e9a818a778c82':
New "sm" shell tool to call StorageManager.
Jeff Sharkey [Wed, 13 May 2015 05:27:28 +0000 (05:27 +0000)]
Merge "New "sm" shell tool to call StorageManager." into mnc-dev
Svet Ganov [Wed, 13 May 2015 04:04:21 +0000 (04:04 +0000)]
am
20cb37c6: Merge "Lower protection level of permissions of permissions" into mnc-dev
* commit '
20cb37c6cb652cbb129f60232f43614d2812c38b':
Lower protection level of permissions of permissions
Svet Ganov [Wed, 13 May 2015 03:55:36 +0000 (03:55 +0000)]
Merge "Lower protection level of permissions of permissions" into mnc-dev
Svet Ganov [Wed, 13 May 2015 03:50:14 +0000 (20:50 -0700)]
Lower protection level of permissions of permissions
Permissions ACCESS_NETWORK_STATE, INTERNET, NFC, DISABLE_KEYGUARD
do not lead to unrecoverable damage and do not lead to PII leaks,
hence they do not meet the bar to be runtime permissions and we
are lowering their protection level.
bug:
21078873
Change-Id: I30c8e742d6a69474171994b65ce070068402ae47
Selim Cinek [Wed, 13 May 2015 03:46:53 +0000 (03:46 +0000)]
am
131c1e29: Made sure that HUNS with full screen intents stay pinned
* commit '
131c1e2960fa5bdf54bfb6fcd5ac98c9f728f796':
Made sure that HUNS with full screen intents stay pinned
Selim Cinek [Tue, 12 May 2015 02:04:49 +0000 (19:04 -0700)]
Made sure that HUNS with full screen intents stay pinned
When a HUN came in with a full screen intent came in and the shade
was open, the notification was not pinned and therefore got lost
when the shade was closed, potentially leading to missed alarms
or calls.
Bug:
20431566
Change-Id: I0d5da0f9baba8d9f68ba2755c40c5fd9a8471191
Fabrice Di Meglio [Wed, 13 May 2015 01:59:54 +0000 (01:59 +0000)]
am
a5c24e3b: Merge "Add IntentFilter auto verification - part 9" into mnc-dev
* commit '
a5c24e3bfe60770ac3180aac15df6c14dbf3bd4a':
Add IntentFilter auto verification - part 9
Fabrice Di Meglio [Wed, 13 May 2015 01:53:08 +0000 (01:53 +0000)]
Merge "Add IntentFilter auto verification - part 9" into mnc-dev
Yorke Lee [Wed, 13 May 2015 01:42:16 +0000 (01:42 +0000)]
am
642737c8: Merge "More video related API fixes" into mnc-dev
* commit '
642737c8aeef645ee4a814d5f375c12791571b9b':
More video related API fixes
Joe LaPenna [Wed, 13 May 2015 01:37:02 +0000 (01:37 +0000)]
am
0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev
* commit '
0cbd0cbd138cdaa367d21f58d8a3fd36f1e73f69':
Reduce display device log spam.
Yorke Lee [Wed, 13 May 2015 01:33:10 +0000 (01:33 +0000)]
Merge "More video related API fixes" into mnc-dev
Selim Gurun [Wed, 13 May 2015 01:31:42 +0000 (01:31 +0000)]
am
94fa0387: Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev
* commit '
94fa03876e7925a31d7715d212d8996e1c798bca':
Add a temporary wrapper for ViewStructure until Webview APK is updated
Amith Yamasani [Wed, 13 May 2015 01:31:37 +0000 (01:31 +0000)]
am
3fec5277: Merge "Allow exemption to idle apps at periodic intervals" into mnc-dev
* commit '
3fec527782d535444f250a96451c4619d3201baa':
Allow exemption to idle apps at periodic intervals
Joe LaPenna [Wed, 13 May 2015 01:26:25 +0000 (01:26 +0000)]
Merge "Reduce display device log spam." into lmp-mr1-modular-dev
Selim Gurun [Wed, 13 May 2015 01:23:51 +0000 (01:23 +0000)]
Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev
Amith Yamasani [Wed, 13 May 2015 01:22:56 +0000 (01:22 +0000)]
Merge "Allow exemption to idle apps at periodic intervals" into mnc-dev
Nicolas Prevot [Wed, 13 May 2015 01:14:53 +0000 (18:14 -0700)]
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
In the html doc, it showed up as (@see #ACTION_PROVISION_MANAGED_PROFILE).
Change-Id: I4b3eec26525c6bd87319296f4bb89d037dfc3d03
Selim Gurun [Wed, 13 May 2015 00:53:24 +0000 (17:53 -0700)]
Add a temporary wrapper for ViewStructure until Webview APK is updated
It turned out that after the API change from ViewAssistStructure to
ViewStructure, the suggested mechanism did not work, and webview
started throwing abstractmethoderror exceptions. Temporarily
solve the problem by wrapping ViewStructure inside a
ViewAssistStructure. Once Webview APK is updated, drop it.
Change-Id: I09dfe7dac9c2bc7c037d842844c61dd879629470
Alan Viverette [Wed, 13 May 2015 00:46:07 +0000 (17:46 -0700)]
Strip PNG metadata
Change-Id: I0d981780f9e6cc8823ff75e662af3f050ff00037
Alan Viverette [Wed, 13 May 2015 00:38:01 +0000 (00:38 +0000)]
am
5401b4cd: Merge "Update APIs to fix build" into mnc-dev
* commit '
5401b4cd601615a06f77df3a80c66c2e2501dc64':
Update APIs to fix build
Alan Viverette [Wed, 13 May 2015 00:29:07 +0000 (00:29 +0000)]
Merge "Update APIs to fix build" into mnc-dev
Roozbeh Pournader [Wed, 13 May 2015 00:27:40 +0000 (00:27 +0000)]
am
dac766c7: Merge "Make Noto Sans Japanese default font on extended profiles." into mnc-dev
* commit '
dac766c7a3a66f1402608003e0e251d82230ac8f':
Make Noto Sans Japanese default font on extended profiles.
Alan Viverette [Wed, 13 May 2015 00:26:47 +0000 (17:26 -0700)]
Update APIs to fix build
Change-Id: I79e15ed436efe9f7223bc54e3737457885fdc571
Svet Ganov [Wed, 13 May 2015 00:23:10 +0000 (00:23 +0000)]
am
221ffb26: Merge "Runtime permissions for system components not revokable - framework" into mnc-dev
* commit '
221ffb2662893db4c0606515133573940c29379a':
Runtime permissions for system components not revokable - framework
P.Y. Laligand [Wed, 13 May 2015 00:23:05 +0000 (00:23 +0000)]
am
ba4d9162: Merge "DO NOT MERGE - Allowing only a subset of display attributes to get overridden." into mnc-dev
* commit '
ba4d9162ba5c3f258d2b407b6c15672d6228c74a':
DO NOT MERGE - Allowing only a subset of display attributes to get overridden.
Ruben Brunk [Wed, 13 May 2015 00:22:59 +0000 (00:22 +0000)]
am
38303bcc: Merge "camera2: Fix DngCreator default crop size." into mnc-dev
* commit '
38303bccb480d000fef1e42408ca4a097d47db92':
camera2: Fix DngCreator default crop size.
Ruben Brunk [Wed, 13 May 2015 00:22:53 +0000 (00:22 +0000)]
am
4143fbcf: Merge "camera2: Fix crop selection in LEGACY." into mnc-dev
* commit '
4143fbcfa88e6557f08d62325c62af6b8ec25b39':
camera2: Fix crop selection in LEGACY.
Roozbeh Pournader [Wed, 13 May 2015 00:19:30 +0000 (00:19 +0000)]
Merge "Make Noto Sans Japanese default font on extended profiles." into mnc-dev
Svet Ganov [Wed, 13 May 2015 00:17:45 +0000 (00:17 +0000)]
Merge "Runtime permissions for system components not revokable - framework" into mnc-dev
P.Y. Laligand [Wed, 13 May 2015 00:15:10 +0000 (00:15 +0000)]
Merge "DO NOT MERGE - Allowing only a subset of display attributes to get overridden." into mnc-dev
Ruben Brunk [Wed, 13 May 2015 00:10:37 +0000 (00:10 +0000)]
Merge "camera2: Fix DngCreator default crop size." into mnc-dev
Ruben Brunk [Wed, 13 May 2015 00:09:49 +0000 (00:09 +0000)]
Merge "camera2: Fix crop selection in LEGACY." into mnc-dev