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
Alex Klyubin
0ee9376ef4
Add EcIesParameterSpec to enable ECIES crypto.
...
Bug: 18088752
Change-Id: I597b019106c500188e0fbbc9608722668c08b421
2015-04-10 14:57:28 -07:00
Alan Viverette
9aac7f7038
Merge "Update rating bar assets for Material"
2015-04-10 21:56:27 +00:00
Shawn Willden
99f4ac1445
am 97fce66f: Merge "Make several key crypto parameters repeatable"
...
* commit '97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f':
Make several key crypto parameters repeatable
2015-04-10 21:51:22 +00:00
Doris Liu
02ecf04097
Merge "Distance based animation duration"
2015-04-10 21:47:25 +00:00
Jorim Jaggi
e144bb15d0
Merge "Keyguard FP UX update"
2015-04-10 21:46:06 +00:00
Jorim Jaggi
3c84e2f2a1
Merge "Enable incremental SysUI builds on -eng targets"
2015-04-10 21:44:12 +00:00
Wei Jia
217ec0adfc
MediaSync: add getTimestamp in MediaSync.
...
Bug: 19666434
Change-Id: Ieae70b13864e3eb5abae3577f209f4b926418731
2015-04-10 14:44:06 -07:00
Jorim Jaggi
27c9b74350
Keyguard FP UX update
...
- Add scanning and error states to UI.
- Do not delay dismissing the panel when authenticating via
fingerprint.
Change-Id: I82e71c554c56e53ddf0677dca3e6909f7cedd59d
2015-04-10 14:43:08 -07:00
Chad Brubaker
386c4e9ea9
Merge "Fix testSaw_ungrantedUid_Bluetooth"
2015-04-10 21:42:23 +00:00
Jorim Jaggi
3557e0ebee
Enable incremental SysUI builds on -eng targets
...
Ideally, we would also do incremental builds on userdebug targets,
but this introduces a risk that userdebug builds would be different
to user builds. So we only do it on eng builds for now.
Change-Id: I2778d270052cf26e6c767f1847991a425d8bbd12
2015-04-10 14:41:17 -07:00
Adam Lesinski
eaa6a3fba8
Merge "Fix deadlock issue in BatteryStatsHelper."
2015-04-10 21:33:50 +00:00
Shawn Willden
97fce66f7d
Merge "Make several key crypto parameters repeatable"
2015-04-10 21:21:37 +00:00
Chad Brubaker
6a5af8cf14
Fix testSaw_ungrantedUid_Bluetooth
...
Keystore.saw returns [] on no result, not null, so the test was
incorrectly failing.
Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
2015-04-10 14:15:17 -07:00
George Mount
0c9227871a
Improve javadoc on SharedElementCallback.
...
Bug 19709650
Change-Id: I52e2164168d17f3c1f3a3235868077f1730c5f3b
2015-04-10 14:13:04 -07:00
Doris Liu
0084e37095
Distance based animation duration
...
In order to preserve the same look and feel of an animation across different
devices, we need to maintain the same angular velocity for the animation in
users' field of view. Since the animation path may span different angles on
different devices, we need to therefore adjust the duration accordingly.
Change-Id: Ia37f213e5a894a046edbb1a45a4ced04e406d85d
2015-04-10 14:09:30 -07:00
Jeff Tinker
2c611f146f
Merge "Add a method to associate MediaDrm session with MediaCrypto"
2015-04-10 21:03:19 +00:00
Olawale Ogunwale
5033c1ef5b
am 448cb9f9: am 6159f6eb: am 4406568e: Merge "Check caller status precisely when registering receiver."
...
* commit '448cb9f9ee8c6bd0a53662362f4a71a1fa4bbd5b':
Check caller status precisely when registering receiver.
2015-04-10 21:01:22 +00:00
Fabrice Di Meglio
2d897fbc44
Add IntentFilter auto verification - part 6
...
- fix handleAllWebDataURI() for taking into account CATEGORY_APP_BROWSER
Change-Id: I91f7628b3e2e40aa44143470ad38576f7874c7ff
2015-04-10 14:00:17 -07:00
John Reck
041a9e5770
Merge "Remove user of GraphicsJNI::createBitmap"
2015-04-10 20:52:51 +00:00