188369 Commits

Author SHA1 Message Date
Geoff Mendal
3de3bb22a6 Import translations. DO NOT MERGE
Change-Id: Ia69d7347d0e753efa924d1b61b416b08affa3329
Auto-generated-cl: translation import
2015-04-10 23:14:36 -07:00
Andy Hung
00b9bcda8a Merge "Add channel index mask to AudioTrack and AudioFormat" 2015-04-11 06:13:14 +00:00
Geoff Mendal
4f6c8f91ac Import translations. DO NOT MERGE
Change-Id: I6c5f88b8d34fba331ba0c8964abfcc2546f39206
Auto-generated-cl: translation import
2015-04-10 23:12:02 -07:00
Geoff Mendal
08c21adc91 Import translations. DO NOT MERGE
Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import
2015-04-10 23:07:04 -07:00
Geoff Mendal
fff84a87e1 Import translations. DO NOT MERGE
Change-Id: I4be4f944cd8c87529e04aa4c8e19198020c1b262
Auto-generated-cl: translation import
2015-04-10 23:01:52 -07:00
Andy Hung
4ef1305aa8 Merge "Add floating point AudioRecord read" 2015-04-11 05:44:23 +00:00
Alex Klyubin
0e67d0a1b0 am 651dbfde: am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit '651dbfde73171ad6451dc8f9288fa4df50f99e4c':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:56:44 +00:00
Alex Klyubin
651dbfde73 am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit 'ad48c4c9c194d66dcc96e74e906825ca7b550e24':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:45:17 +00:00
David Friedman
ea51127bcb am d34b20e9: am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit 'd34b20e957f66e113e7d39e253d69450545b5961':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:43:27 +00:00
Qiwen Zhao
f2834c12a3 Merge "remove data-binding from base/tools. it should not be here since it depends on support lib." 2015-04-11 02:42:43 +00:00
Alex Klyubin
ad48c4c9c1 am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit 'c1c6528d2b686d5a17e577e7864a319dcba7c224':
  Add EcIesParameterSpec to enable ECIES crypto.
2015-04-11 02:35:45 +00:00
David Friedman
d34b20e957 am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit 'a22125ff98085c0fe662966cadfe4c889707db54':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:27:01 +00:00
Svetoslav
6435d00e11 Merge "First pass on the new permission grouping." 2015-04-11 02:24:15 +00:00
Alex Klyubin
c1c6528d2b Merge "Add EcIesParameterSpec to enable ECIES crypto." 2015-04-11 02:17:01 +00:00
David Friedman
a22125ff98 am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '23b5e508adfb454552fda16d76d65b070a53f759':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:15:48 +00:00
Adam Lesinski
d8d07f1757 Merge "AAPT2: Create Makefile" 2015-04-11 02:10:32 +00:00
Adam Lesinski
c7e2432dec AAPT2: Create Makefile
Makefile that uses zip for assembling the final APK. This is temporary and
helps speed up the rest of development.

Has to add a new 'manifest' phase that simply compiles the AndroidManifest.xml.
Manifests are handled differently and must be validated.

Change-Id: I0d8255b3ad0d0b0a322683077e3331ca93e37fa0
2015-04-10 19:07:51 -07:00
Fabrice Di Meglio
30ca50a3dd Merge "Add Default Browser App support and relax Hosts validation for AppLinks" 2015-04-11 02:07:39 +00:00
David Friedman
23b5e508ad am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '340a617ef42951446bbc730833cea207370307d0':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 02:05:57 +00:00
David Friedman
340a617ef4 am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '746fed63567c548c7b55c14e1532d059753bfa52':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 01:55:32 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
2015-04-10 18:34:51 -07:00
Svetoslav
61a4dd5c66 First pass on the new permission grouping.
1. Defining the new permission groups and moving relevant permissions
   to these groups.

2. Removed some permissions that were guading ... nothing and old
   permission groups.

3. Removing unnecessary comments for siganture and system permissions
   as they are no surfaced to the user.

Change-Id: Ibd7e6bb22b3559a4febb37c39326350eeb4285bd
2015-04-10 18:34:32 -07:00
Svetoslav
975ab5c0f0 Merge "Add a mechanism to make pending intents immutable." 2015-04-11 01:30:46 +00:00
Svetoslav
b0a78390ed Add a mechanism to make pending intents immutable.
bug:19618745

Change-Id: Ice742e0162cb9b7c0afbc32e0eea03d501666e2b
2015-04-10 18:19:03 -07:00
Fabrice Di Meglio
6227172310 Add Default Browser App support and relax Hosts validation for AppLinks
- add private PackageManager APIs for setting/getting the default
Browser App package name
- serialize / deserialize the default Browser App package name per User

Also relax the Hosts name validation for the AppLinls feature. Now we
just care if the IntentFilter is having an HTTP or HTTPS scheme.

Change-Id: I4436f66ac6beff57e14f7f3a2a00b0b582c03be9
2015-04-10 17:54:02 -07:00
Andy Hung
a9470c19a9 Add channel index mask to AudioTrack and AudioFormat
Change-Id: Ia5faa56360edcbbdeae8838ec0f82386f4e5e640
2015-04-10 17:41:00 -07:00
Fabrice Di Meglio
69010094aa Merge "Add IntentFilter auto verification - part 6" 2015-04-11 00:23:04 +00:00
Eino-Ville Talvala
dddc56660a Merge "Revert "Revert "Camera2: Add camera pose and distortion fields""" 2015-04-10 23:54:39 +00:00
Wei Jia
dfb0e6236b MediaSync: fix a typo.
Bug: 19666434
Change-Id: I31e959f49d2539e11a9f23f9f9d7eb785ec08512
2015-04-10 16:48:14 -07:00
George Mount
06ecdc1a0c Fix transition not properly removing targets on completion.
Bug 19770911

The enter transition was adding the non-existent View to its
list of entering Views, but was removed from the transition
improperly so that the comparison of Views formed a mismatch.

Change-Id: Iccaf5fb48e8fb5931efd75a0cd3a0b3dbcea28b6
2015-04-10 16:36:38 -07:00
Fyodor Kupolov
2e29aa5ea7 Merge "Added getUserCreationTime to query user/profile creation time" 2015-04-10 23:33:29 +00:00
Qiwen Zhao
f73037aee9 remove data-binding from base/tools. it should not be here since it depends on support lib.
Change-Id: Iac90ab2fb797617429a6a4e1e429f085455154e2
2015-04-10 16:04:41 -07:00
Prerepa Viswanadham
57bf2a8a38 Merge commit 'e593d0a' into merge_work
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
2015-04-10 15:58:10 -07:00
Prerepa Viswanadham
3932bb4153 Merge commit '3dda1fa' into merge_work 2015-04-10 15:55:14 -07:00
Prerepa Viswanadham
220951a6d0 Merge commit 'b2ff415' into merge_work
Change-Id: I4f9c662112fc49e4f94315d3c69860607be3bc1e
2015-04-10 15:54:48 -07:00
Prerepa Viswanadham
f79d5b84d5 Merge commit '271c9ed' into merge_work 2015-04-10 15:52:58 -07:00
Prerepa Viswanadham
a8b4bac249 Merge commit '998fb19' into merge_work 2015-04-10 15:52:44 -07:00
Svetoslav
c8f786b1ed Merge "Fix accounting of permission gids." 2015-04-10 22:45:06 +00:00
Wei Jia
e833b534c9 Merge "MediaSync: add getTimestamp in MediaSync." 2015-04-10 22:44:09 +00:00
Alan Viverette
816aa14202 Fix date picker dialog size
Also fixes date picker instance state restore and cleans up the fade
animations.

Bug: 20110268
Change-Id: I503e2f81253077f22f1619834dc2f2634138ae4e
2015-04-10 15:41:10 -07:00
Svetoslav
b3a6defec8 Fix accounting of permission gids.
bug:20143490

Change-Id: I718d4db74ebf003616241710a67774b2e2e5384f
2015-04-10 15:33:03 -07:00
Adam Lesinski
105b8a5f4f Merge "AAPT2: Adding basic binding support" 2015-04-10 22:27:38 +00:00
Chad Brubaker
03c13e430d am 93976df8: am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"
* commit '93976df800641c9d56b73af6cb4bab9cc9a5f59e':
  Fix testSaw_ungrantedUid_Bluetooth
2015-04-10 22:26:25 +00:00
Adam Lesinski
4d3a987694 AAPT2: Adding basic binding support
This is incomplete. Still requires:

- filling in layout information in the resulting .bind.xml
- processing elements with <view class=""/>
- processing imports

Change-Id: Ie5d4c5e6435591bbed3248129a548736244894eb
2015-04-10 15:25:39 -07:00
Chad Brubaker
93976df800 am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"
* commit '3a9779b6edf9b118d8907a8124cd53c05f72aa00':
  Fix testSaw_ungrantedUid_Bluetooth
2015-04-10 22:17:00 +00:00
Shawn Willden
46bcfb64fb am c88e1396: am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"
* commit 'c88e1396db12e430dde63afc3d44c1f37a7fce79':
  Make several key crypto parameters repeatable
2015-04-10 22:12:53 +00:00
Chad Brubaker
3a9779b6ed am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"
* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth
2015-04-10 22:09:18 +00:00
Shawn Willden
c88e1396db am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"
* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable
2015-04-10 22:01:15 +00:00