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

189584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
24ccb90025 am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '7a866a88318f6a44f316dc18e0472f39a289fee6':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:44:24 +00:00
Tor Norbye
63fc151475 Merge "Add @RequiresPermission" 2015-04-23 18:36:33 +00:00
Andrew Solovay
26a8090a09 cherrypick from lmp-docs docs: Listening for restrictions-changed 
Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d

Per bug 19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED
is only sent to dynamically-declared listeners, *not* to listeners
declared in the manifest. Updated doc to note this. (The code snippet
already showed how to dynamically declare a listener.)

See first comment for doc stage location.

bug: 19848206
Change-Id: I6dc5f39dc6eed71cf2e303564ea906be3832d8a4
 2015-04-23 11:35:39 -07:00
Robert Greenwalt
b36d2a6111 Merge "Radio Access Family related fixes" 2015-04-23 18:34:35 +00:00
Abhishek Adappa
c180f9adf7 Radio Access Family related fixes 
1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
 2015-04-23 11:33:30 -07:00
Andrew Flynn
1326769666 Merge "Demo Mode instructions for Carrier Network Change icon" 2015-04-23 18:32:46 +00:00
Andrew Solovay
7a866a8831 am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:31:59 +00:00
Abodunrinwa Toki
ab79dee28a Merge "Fix FloatingToolbar.show()" 2015-04-23 18:27:23 +00:00
Andrew Solovay
09cf4d500d Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 2015-04-23 18:20:07 +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
Leon Scroggins III
67326bcba0 am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:41:49 +00:00
Leon Scroggins III
ea2dcda788 am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:29:22 +00: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
Leon Scroggins III
ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:20:02 +00:00
Andrew Flynn
a47a6609d6 Demo Mode instructions for Carrier Network Change icon 
Bug: 11392659
Change-Id: I8ca15a51d8079e83dc87bfe90d274a17cbe04c25
 2015-04-23 09:16:18 -07:00
Craig Mautner
0edd74db6e Merge "Add and remove DeviceInitializer from whitelist" 2015-04-23 15:55:22 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Leon Scroggins III
a7501119e3 am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:48:12 +00:00
Andrew Flynn
4cec756e85 Merge "Add SystemUI demo mode README to tree." 2015-04-23 15:46:59 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:43:01 +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
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:30:43 +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
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev 
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-04-23 15:18:10 +00:00
Svet Ganov
00e91901fd Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev 2015-04-23 15:09:48 +00: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
Neil Fuller
9f7cd10134 Load ICU4J data on boot 
Bug: 20252074
Bug: 20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
 2015-04-23 14:50:34 +01:00