drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
189,389 Commits 1 Branch 0 Tags
Commit Graph

189389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abodunrinwa Toki
ab79dee28a Merge "Fix FloatingToolbar.show()" 2015-04-23 18:27:23 +00:00
Craig Mautner
00984f1629 Merge "Disallow data clearing of DeviceOwner." 2015-04-23 18:15:03 +00:00
Svet Ganov
112de0d41b Merge "Return an empty cursor when a content provider app op is disabled" 2015-04-23 18:12:52 +00:00
Craig Mautner
015c5e57b5 Disallow data clearing of DeviceOwner. 
There are OEM provided apps that are able to clear the data of the
device owner. That creates a security hole that this fixes.

Fixes bug 20107015.

Change-Id: I4ef313b394bd8059d19d20aa6533396305d1357d
 2015-04-23 11:05:02 -07:00
Joe Fernandez
78cb6f5458 am 1009c8de: am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 
* commit '1009c8de23920c4a368edf7f1e2ecde63e40ec82':
  docs: Add text to JavaDocs regarding browser file access vulnerability
 2015-04-23 17:57:02 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
 2015-04-23 17:45:19 +00:00
Dianne Hackborn
be3d85fb96 Merge "Hopefully fix issue #20297662: Statusbar clock not updating" 2015-04-23 17:37:29 +00:00
Abodunrinwa Toki
0ce3e08a84 Fix FloatingToolbar.show() 
*Finer cancel animation methods so we call only the necessary ones.

*Don't set the FloatingToolbarPopup content view's alpha to 0
 before showing it's popup window.

*FloatingToolbarPopup.dismiss() should run when toolbar is hidden.

Bug: 20456876
Change-Id: I2e7ff5f2ec56af2def0976fa8e770c651daaa3a3
 2015-04-23 17:33:58 +00:00
Joe Fernandez
92ae292e86 Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 2015-04-23 17:33:18 +00:00
Dianne Hackborn
35d5403775 Hopefully fix issue #20297662: Statusbar clock not updating 
Make sure that whenever we no longer have a pending-idle-until
alarm, we get all of the pending alarms re-added.

Change-Id: I7e80bc02afff22827d876ef5d4a381ebb62ec8e3
 2015-04-23 10:30:43 -07:00
Svet Ganov
7271f3e4cb Return an empty cursor when a content provider app op is disabled 
bug:17446599

Change-Id: Ic1790c9afbee5eec1dc28e1d53ce82288d4b4f86
 2015-04-23 10:26:59 -07:00
Yorke Lee
6446d97942 Merge "Add hidden class in framework for managing the default dialer settings" 2015-04-23 17:23:41 +00:00
Yorke Lee
014de02dd2 Add hidden class in framework for managing the default dialer settings 
Bug: 20303635
Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
 2015-04-23 10:19:52 -07:00
Tomasz Mikolajewski
366459ee59 Merge "Update strings for the copy error dialog to match the latest specs." 2015-04-23 17:13:33 +00:00
Robert Greenwalt
cfa26c2a38 Merge "Don't show two identical carrier names." 2015-04-23 17:12:55 +00:00
Tomasz Mikolajewski
eafb267bd9 Update strings for the copy error dialog to match the latest specs. 
Change-Id: I9adeff3e7e9435237b4b3337e4c687eec39b0335
 2015-04-23 19:10:14 +02:00
Tomasz Mikolajewski
43fe1b3431 Merge "Implement retrying copying in case of an error in DocumentsUI." 2015-04-23 17:06:27 +00:00
Sanket Padawe
b8726b7002 Don't show two identical carrier names. 
Multi-sim device would show 2 PLMN in status bar even if they are same.

Bug: 19710990
Change-Id: I07ba5cbf82d4cc99bb7be644cc1e95c525bcfb8b
 2015-04-23 10:06:04 -07:00
Fyodor Kupolov
7fadb2f542 Merge "Do not create oat directory for an app in ASEC container" 2015-04-23 16:55:32 +00:00
Fyodor Kupolov
94056d1cb8 Do not create oat directory for an app in ASEC container 
Currently installation fails, if an app is located on SD card (inside ASEC).
If an app is located inside ASEC, dexopt output should go to
/data/dalvik-cache. dexopt also needs to be performed at a later stage,
because the name of the oat file contains the absolute path to the dex file.

Bug: 20452651
Change-Id: I4432ca7a0b0e88b705705acf42e5cae78cadf729
 2015-04-23 09:52:55 -07:00
Tomasz Mikolajewski
f8c3f322a2 Implement retrying copying in case of an error in DocumentsUI. 
Change-Id: I9ed1eb624aa30fb7e65d4d424ebd988dfc06d030
 2015-04-23 18:51:33 +02:00
Dianne Hackborn
4d7c8e04a2 Merge "Maybe fix needing wifi permission to dump battery stats." 2015-04-23 16:26:41 +00:00
Dianne Hackborn
871af48390 Merge "Add "assist block" API." 2015-04-23 16:26:27 +00:00
Wale Ogunwale
2ff8ca659e Merge "Fixed bug with black background when exiting a wallpaper window." 2015-04-23 16:22:03 +00:00
Craig Mautner
0edd74db6e Merge "Add and remove DeviceInitializer from whitelist" 2015-04-23 15:55:22 +00:00
Andrew Flynn
4cec756e85 Merge "Add SystemUI demo mode README to tree." 2015-04-23 15:46:59 +00:00
Craig Mautner
de8b3fa6cb Merge "Fix bad crop on clip reveal animation" 2015-04-23 15:40:12 +00:00
Craig Mautner
80b1f64280 Fix bad crop on clip reveal animation 
For non-fullscreen apps the dimensions of the app window must be used
to set up the animation.

Fixes bug 18392184.

Change-Id: Ia1681e4a2cb74be2f820cb76ddc7c651a5e4aab6
 2015-04-23 15:37:48 +00:00
Craig Mautner
5173dc28f3 Add and remove DeviceInitializer from whitelist 
Add the DeviceInitializer to the locktask whitelist when set or when a
new user is created. Remove DeviceInitializer from whitelist when
user setup complete.

Fixes bug 20267837.

Change-Id: I8a33bceb6e6f3d0316a1227b2ed2b713f4ca3a9e
 2015-04-23 08:30:20 -07:00
Jason Monk
052324c137 Merge "Add constants for usage access settings" 2015-04-23 14:42:17 +00:00
Jason Monk
6f909783e9 Add constants for usage access settings 
Bug: 20290386
Change-Id: I216ad25b94de739449941a8b4e965329fe324f66
 2015-04-23 10:07:56 -04:00
Lajos Molnar
cca7893f52 Merge "media: surface parity for MediaCodec & Recorder" 2015-04-23 13:39:22 +00:00
Lajos Molnar
17d79047c7 media: surface parity for MediaCodec & Recorder 
allow setting output surface dynamically on MediaCodec
allow creating persistent input surface for MediaCodec and MediaRecorder

Bug: 19127604
Bug: 19489395
Change-Id: I68d95ce012574f1cc161556fd7d016be104e5076
 2015-04-23 13:38:39 +00:00
Lajos Molnar
c3e41da545 Merge "media: VideoCapabilities: publish codec performance data" 2015-04-23 13:35:44 +00:00
Lajos Molnar
8bd7375115 Merge "media: add OnFrameRenderedListener to MediaCodec" 2015-04-23 13:33:11 +00:00
Lajos Molnar
fd81041a63 media: add OnFrameRenderedListener to MediaCodec 
Also allow setting the handler for async callbacks.

Bug: 20503131
Change-Id: If9d24bce75c253a1c7f9c5d41ff5f6447b4622a1
 2015-04-23 13:31:36 +00:00
Chet Haase
a20ea2f056 Merge "Add annotation to Rect.intersect()" 2015-04-23 13:29:59 +00:00
Abodunrinwa Toki
19d0f53964 Merge "Fix floating toolbar touchable region bug." 2015-04-23 12:50:56 +00:00
Dongwon Kang
23d076ba7f Merge "TIF: add more documentation on Session.onTimeShiftSetPlaybackRate()." 2015-04-23 10:49:08 +00:00
Lorenzo Colitti
51f88a15e1 Merge "@removed requestRouteToHost and {start,stop}UsingNetworkFeature" 2015-04-23 10:21:28 +00:00
Andrei Stingaceanu
e72e94767c Merge "Introduce "Share" option to the floating text selection toolbar." 2015-04-23 09:15:07 +00:00
Rubin Xu
1964ea500b Merge "Enable system service to notify device owners about pending update" 2015-04-23 09:05:07 +00:00
Lorenzo Colitti
e285b434f4 @removed requestRouteToHost and {start,stop}UsingNetworkFeature 
Bug: 20482461
Change-Id: Ic59fc1271e664d85102dc7945c0c2ea82c0d6f6b
 2015-04-23 17:44:05 +09:00
Lajos Molnar
38a296a65f media: VideoCapabilities: publish codec performance data 
Bug: 20507129
Change-Id: I0508bdc9aec8eeeb3ebe16ef21f58d5c0d75af4b
 2015-04-23 01:02:39 -07:00
Lajos Molnar
aba29b77a5 media: rename MediaSync.configureSurface/AudioTrack to set... 
Change-Id: Ia1ebf5747959a89635dd45b8966a201397374c71
 2015-04-23 07:40:46 +00:00
Lajos Molnar
1c3f534a8e Merge "media: make MediaTimestamp an immutable class" 2015-04-23 07:37:50 +00:00
Lajos Molnar
28fa1ac547 Merge "media: add SyncSettings to MediaSync and MediaPlayer" 2015-04-23 07:36:44 +00:00
Lajos Molnar
7f08763f41 media: make MediaTimestamp an immutable class 
Change-Id: I75efee22c4f4babbeaa02624349b5e164fbfe0ec
 2015-04-23 00:16:23 -07:00
Dongwon Kang
8b40086449 TIF: add more documentation on Session.onTimeShiftSetPlaybackRate(). 
Specifies that the playback rate should be preserved after pause/resume
/seek as MediaPlayer does.

Bug: 20129784
Change-Id: Ibdd4145258580127351adcee28022523a862effa
 2015-04-23 15:48:10 +09:00
Keisuke Kuroyanagi
3239a62d31 Merge "Fix: Wrong condition to detect selection shrink." 2015-04-23 06:07:07 +00:00