George Mount
7e2c8d85ca
am 7a0f54b1: Merge "Fix addTarget not limiting to the given views." into mnc-dev
...
* commit '7a0f54b1400c9ca0cb32819dd3a3784f9aa7c351':
Fix addTarget not limiting to the given views.
2015-06-26 21:28:37 +00:00
George Mount
7a0f54b140
Merge "Fix addTarget not limiting to the given views." into mnc-dev
2015-06-26 21:18:39 +00:00
Christopher Tate
ef31443c01
am 1c3b7a6d: Merge "Use a framework resource to name a factory-default browser app" into mnc-dev
...
* commit '1c3b7a6de6593c8a1c01ce48e04dda7e11471288':
Use a framework resource to name a factory-default browser app
2015-06-26 21:13:13 +00:00
Jim Miller
4982b00fe1
am 63ec93d5: Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev
...
* commit '63ec93d57094be624f2069d063146ca713574530':
Have FingerprintService keep the device awake on relevant events.
2015-06-26 21:13:08 +00:00
Ying Wang
beda03a9dc
am 45f143fe: Merge "Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES" into mnc-dev
...
* commit '45f143fe48e42e8c21d1f8daf49b082834ea0321':
Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES
2015-06-26 21:13:03 +00:00
Christopher Tate
1c3b7a6de6
Merge "Use a framework resource to name a factory-default browser app" into mnc-dev
2015-06-26 21:05:27 +00:00
Jim Miller
63ec93d570
Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev
2015-06-26 21:01:24 +00:00
Ying Wang
45f143fe48
Merge "Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES" into mnc-dev
2015-06-26 21:01:03 +00:00
Robin Lee
04bc927a92
am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
...
* commit 'cd7ceb0711672eabd1de578f2452ddcb8a322f68':
SystemUI: show owner VPN for restricted profile
2015-06-26 21:00:59 +00:00
Ying Wang
559ea2fd8c
Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES
...
Change-Id: I08c2439bcab934e23c697b93aec47b2c7bcba037
2015-06-26 13:51:18 -07:00
Christopher Tate
db3fe81990
Use a framework resource to name a factory-default browser app
...
If there is no resource-named default but there is a single factory-
installed browser app, that app is made the titular default.
This also introduces a permission guard on attempts to set the
default browser or the app-link state. These operations are now
contingent on the existing SET_PREFERRED_APPLICATIONS permission.
Bug 21778406
Change-Id: Id099bb9c4141f28917546492657cd2fba472e6b6
2015-06-26 13:48:33 -07:00
Adam Powell
6ac4c58de6
am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev
...
* commit '6356d3b2504cefce59761d67b642ae37f8ba2d8b':
Improve docs for View#addChildrenForAccessibility
2015-06-26 20:47:22 +00:00
Robin Lee
cd7ceb0711
Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev
2015-06-26 20:44:57 +00:00
Amith Yamasani
7695d37b38
am 24336555: Merge "Clarify the intention of setNotificationsShown" into mnc-dev
...
* commit '24336555658377383a1b4a1a22b1f24346b5ff68':
Clarify the intention of setNotificationsShown
2015-06-26 20:38:54 +00:00
Svet Ganov
4ac318c769
am 6cbf7928: Merge "Revert get accounts permission to normal for now" into mnc-dev
...
* commit '6cbf792833f1bd73c56945c23e6ec8fd9fa29575':
Revert get accounts permission to normal for now
2015-06-26 20:38:48 +00:00
Dianne Hackborn
3dd9fa6bef
am 7c5b5f71: Merge "Fix issue #22023824 : Download folder is not created in internal storage" into mnc-dev
...
* commit '7c5b5f713af307fdc8cadfc39ae60b696a37e33a':
Fix issue #22023824 : Download folder is not created in internal storage
2015-06-26 20:38:42 +00:00
Chris Craik
e2c15b2482
am f8d25ea8: Merge "Don\'t promote functors onto layers due to outline rect clipping" into mnc-dev
...
* commit 'f8d25ea8ebece1d13f71f3e92dac814d02a32b91':
Don't promote functors onto layers due to outline rect clipping
2015-06-26 20:38:37 +00:00
Adam Powell
6356d3b250
Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev
2015-06-26 20:35:37 +00:00
Amith Yamasani
2433655565
Merge "Clarify the intention of setNotificationsShown" into mnc-dev
2015-06-26 20:34:33 +00:00
Svet Ganov
6cbf792833
Merge "Revert get accounts permission to normal for now" into mnc-dev
2015-06-26 20:30:36 +00:00
Dianne Hackborn
7c5b5f713a
Merge "Fix issue #22023824 : Download folder is not created in internal storage" into mnc-dev
2015-06-26 20:30:21 +00:00
Chris Craik
f8d25ea8eb
Merge "Don't promote functors onto layers due to outline rect clipping" into mnc-dev
2015-06-26 20:28:36 +00:00
Dianne Hackborn
ca8e6da41c
Fix issue #22023824 : Download folder is not created in internal storage
...
The media provider and some other things need to be given storage access.
Also, seems like we should give storage access to the camera app as well.
And add a dump dump command that will dump data about a particular
permission name.
Change-Id: Idaaa9bba2ff4dc95290cf6d17e5df933df91e909
2015-06-26 13:28:29 -07:00
Eino-Ville Talvala
9376800e1c
am daee1e5b: Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev
...
* commit 'daee1e5bdeb6a173c042438f79663c9a84a469b8':
Camera2: Add clarification about simultaneous trigger use
2015-06-26 20:06:56 +00:00
Eino-Ville Talvala
daee1e5bde
Merge "Camera2: Add clarification about simultaneous trigger use" into mnc-dev
2015-06-26 19:53:30 +00:00
Eric Laurent
1f6aa80639
am 5da8ed16: Merge "AudioManager: optimize audio port listener registration" into mnc-dev
...
* commit '5da8ed16239c81c535afd01d91d68b6c2d96eff6':
AudioManager: optimize audio port listener registration
2015-06-26 17:47:59 +00:00
Mady Mellor
a9937a525a
am 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev
...
* commit '29f37e15975dec1fbb519398e5e80b16d61a5d0c':
Text selection: When user reaches midpoint jump to end of word
2015-06-26 17:47:54 +00:00
Mady Mellor
b893fd5704
am 10f92517: Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev
...
* commit '10f925173630c89239e2f42deb6cb042e9300d39':
Text selection: Fix word boundaries for languages without spaces
2015-06-26 17:47:49 +00:00
Eric Laurent
5da8ed1623
Merge "AudioManager: optimize audio port listener registration" into mnc-dev
2015-06-26 17:43:03 +00:00
Mady Mellor
29f37e1597
Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev
2015-06-26 17:38:08 +00:00
Robin Lee
63204eeafe
SystemUI: show owner VPN for restricted profile
...
Restricted profiles don't have their own VPN configuration - whatever
is in charge of VPN for our USER_OWNER user will have network traffic
routed to it instead.
Bug: 18419023
Bug: 21188177
Change-Id: I7205d90032461c240048a036606c3a7938d0eda2
2015-06-26 10:35:25 -07:00
Mady Mellor
10f9251736
Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev
2015-06-26 17:33:22 +00:00
Dianne Hackborn
ff89df0703
am ff81025a: Merge "Fix issue #22013372 : Assist should take translationX and friends..." into mnc-dev
...
* commit 'ff81025a9def3e56908339ad846bff515d5ecbfb':
Fix issue #22013372 : Assist should take translationX and friends...
2015-06-26 17:32:54 +00:00
Svet Ganov
a508bf8ba2
Revert get accounts permission to normal for now
...
Change-Id: I51efe557b69a50d85dc53ba7a1622b7bafc301e6
2015-06-26 10:25:02 -07:00
Dianne Hackborn
ff81025a9d
Merge "Fix issue #22013372 : Assist should take translationX and friends..." into mnc-dev
2015-06-26 17:20:12 +00:00
Eric Laurent
c573bc5d3d
AudioManager: optimize audio port listener registration
...
In order to reduce the number of binder calls, only install an
audio port callback in a client process if either:
- an audio port related API has been called once
- an audio port listenr has been registered.
Bug: 22045560.
Change-Id: I0e5cf31bec0c986d6f7761891b860ba6fadd2f4c
2015-06-26 10:01:12 -07:00
Jeff Sharkey
344920775a
am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev
...
* commit 'd2c414573242fc59a2d34f66f1dfb610ec7d59a3':
Let's reinvent storage, yet again!
2015-06-26 15:52:57 +00:00
Jeff Sharkey
d2c4145732
Merge "Let's reinvent storage, yet again!" into mnc-dev
2015-06-26 15:43:31 +00:00
Selim Cinek
a45d81d4ac
am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
...
* commit 'b84ace51b21b9b1d422e96ed023ef3860ca0710d':
Fixed a crash where onTouch might have been called too early
2015-06-26 15:33:55 +00:00
Selim Cinek
0feec55e27
am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
...
* commit 'eb4ce1d6a3bfa99ec57604aa842835a381616346':
Now showing unlocked icon if both trusted and fingerprint running
2015-06-26 15:33:50 +00:00
Selim Cinek
b84ace51b2
Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev
2015-06-26 15:26:29 +00:00
Selim Cinek
eb4ce1d6a3
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
2015-06-26 15:26:08 +00:00
Abodunrinwa Toki
9209ff2c32
am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev
...
* commit 'a2e0dc4d20be14ea106b44067cc782774d90df3b':
Enforce FloatingToolbar themes.
2015-06-26 05:32:38 +00:00
Svetoslav
413b82d189
am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev
...
* commit 'e171899ac8007160eee199eaa6c840fae40dfba7':
Add JavaDoc for permission protection level
2015-06-26 05:32:34 +00:00
Abodunrinwa Toki
a2e0dc4d20
Merge "Enforce FloatingToolbar themes." into mnc-dev
2015-06-26 05:26:40 +00:00
Jeff Sharkey
9527b223a9
Let's reinvent storage, yet again!
...
Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app. This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.
The only thing left that can change dynamically is the filesystem
itself, so let's do that. This means changing the FUSE daemon to
present itself as three different views:
/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access
There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.
During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions. When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.
Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2
2015-06-25 22:25:48 -07:00
Svetoslav
e171899ac8
Merge "Add JavaDoc for permission protection level" into mnc-dev
2015-06-26 05:24:45 +00:00
Keisuke Kuroyanagi
d6054d7148
am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev
...
* commit 'c1bd7da9906bc95c791dec6d52508fc9ee916a99':
Fix: Ellipsis is wrongly applied or not applied in TextView.
2015-06-26 05:19:54 +00:00
Seigo Nonaka
066b936347
am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev
...
* commit '084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17':
Do not show selection action mode when the TextView is not shown.
2015-06-26 05:19:49 +00:00
Keisuke Kuroyanagi
c1bd7da990
Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev
2015-06-26 05:11:25 +00:00