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

209126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
f8acd1d8d6 Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev 2015-07-25 00:33:14 +00:00
Fyodor Kupolov
ce09a024f8 Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION 
Call to checkPermission(ACCESS_COARSE_LOCATION) should return
PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission

Bug: 21852542
Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189
 2015-07-24 16:54:15 -07:00
Adrian Roos
80996bbf40 resolved conflicts for merge of d4352533 to master 
Change-Id: I2b9b39a76fdda1e470cba3634ed9986e658d9810
 2015-07-24 16:38:58 -07:00
Andreas Gampe
3e0c1c4804 am d1fffe1c: am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit 'd1fffe1c898c2de3b78a82b504c739c60b1ce31a':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 23:19:55 +00:00
Andreas Gampe
ac2c632ff1 am c0999f78: Merge "Frameworks/base: Hand fingerprint to ART" 
* commit 'c0999f7877616826f7c371fb49b081b82ad9b067':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 22:51:49 +00:00
Adrian Roos
d435253322 am cd647578: am 16b74922: am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit 'cd64757831606e5c44decc1b2e17e9a9558b0cf1':
  Fix janky add guest transition
 2015-07-24 22:42:14 +00:00
Chris Banes
c174de0ab3 am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit '5442932a4befd66394fb155ae95a2eaadd2001a9':
  v22.2.1 support api diff
 2015-07-24 22:41:35 +00:00
Adrian Roos
384b5d20b6 am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit 'a65de4fde99c84ae7c7cab242e8e1e46ee6c0a5d':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-24 22:41:26 +00:00
Andreas Gampe
c0999f7877 Merge "Frameworks/base: Hand fingerprint to ART" 2015-07-24 22:38:28 +00:00
Andreas Gampe
1f105a6b27 Frameworks/base: Hand fingerprint to ART 
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991

(cherry picked from commit e60825033fdde9eefaeec768a28b907e2d22f10c)

Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
 2015-07-24 15:37:39 -07:00
Adrian Roos
cd64757831 am 16b74922: am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit '16b7492240b92a81332e61680f51073da8af186c':
  Fix janky add guest transition
 2015-07-24 22:29:12 +00:00
Andreas Gampe
d1fffe1c89 am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '505a252cf7120dda0f1afb72f532bd99ada23baa':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 22:28:35 +00:00
Chris Craik
6260b22501 Fix bitmap get/set pixels for ALPHA_8 
bug:22724734

Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5
 2015-07-24 15:27:48 -07:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions. 
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
 2015-07-24 15:16:11 -07:00
John Reck
68fbd6a496 Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 2015-07-24 22:15:47 +00:00
Andreas Gampe
505a252cf7 am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '851f51855502e2d4a1cb1bd9764cb6f81682b8a6':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 22:09:27 +00:00
Adrian Roos
16b7492240 am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit 'b6c18ab8cc33b1e813b5e1d54441d7192da3bfec':
  Fix janky add guest transition
 2015-07-24 22:09:25 +00:00
Adrian Roos
b6c18ab8cc am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit '4629f1c58c00480b0dbd5a541a26b703b0770bf4':
  Fix janky add guest transition
 2015-07-24 21:57:16 +00:00
Andreas Gampe
851f518555 am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '08edf246e97b60098a1e7c661b99412577f231f0':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 21:56:56 +00:00
Adrian Roos
4629f1c58c Merge "Fix janky add guest transition" into mnc-dev 2015-07-24 21:42:46 +00:00
Andreas Gampe
08edf246e9 am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 21:39:24 +00:00
Xiaohui Chen
dc92caacf5 Merge "sys user split: add user logout" 2015-07-24 21:38:59 +00:00
Andreas Gampe
9a755e3650 Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 2015-07-24 21:25:09 +00:00
Andreas Gampe
e60825033f Frameworks/base: Hand fingerprint to ART 
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
 2015-07-24 14:19:44 -07:00
Xiaohui Chen
860397f652 sys user split: add user logout 
Adding a user logout option as a pending notification. Similar to the
guest user remove notification.  This allows the end user to return
to system user "login" screen.

Bug: 19913735
Change-Id: I72c49c12e9c8acef92be2353008468acb3d7a795
 2015-07-24 14:13:36 -07:00
Phil Burk
98e94aead7 MIDI: fix running status parser 
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.

Bug: 22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-24 14:11:01 -07:00
Robert Greenwalt
9b9a0e5098 am 58b2d330: (-s ours) am 0b9624d4: am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '58b2d330b71412ac66ad38b7caf15920bc93f59a':
  DO NOT MERGE Enhance local log.
 2015-07-24 21:07:08 +00:00
Robert Greenwalt
58b2d330b7 am 0b9624d4: am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '0b9624d4c46ba56f12b931ec4f56d33f378b7e6f':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:54:05 +00:00
Amith Yamasani
5891a346ab resolved conflicts for merge of 54e9686d to master 
Change-Id: I5352ba632c8481168ad6a08861e73b058e617d29
 2015-07-24 13:50:58 -07:00
Robert Greenwalt
0b9624d4c4 am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '98961ea0007ab540794c8d460d9b060e9503d9c6':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:35:21 +00:00
Fyodor Kupolov
bb7ee1ce47 am 9008192e: am b02f646c: am 71b4c049: am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit '9008192e354165cc81fe16cf38241987e796c271':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 20:33:30 +00:00
Robert Greenwalt
98961ea000 am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '7385aca1a2bcb702cbf49b4cd3d1cf60972f9407':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:22:48 +00:00
Chris Banes
5442932a4b am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit '7b099152b6bd5844c30464a7c08dde2e22124491':
  v22.2.1 support api diff
 2015-07-24 20:19:09 +00:00
Amith Yamasani
54e9686d74 am 310fe847: am 8582f9f7: am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev 
* commit '310fe847dfd890f6da1f45942826d9eb712be82f':
  Require permission for internal broadcast
 2015-07-24 20:13:28 +00:00
Robert Greenwalt
7385aca1a2 am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:06:31 +00:00
Amith Yamasani
310fe847df am 8582f9f7: am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev 
* commit '8582f9f7591382e360ff9c2e93ea29c3fe65efde':
  Require permission for internal broadcast
 2015-07-24 19:57:34 +00:00
Adam Lesinski
515702c29e BatteryStats: Decode wakeup reasons in Java 
Wakeup reasons come from drivers and sometimes are malformed UTF-8.
Decode them in Java so we can easily replace malformed characters
and still have user visible strings.

Bug:22368519
Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
 2015-07-24 12:56:37 -07:00
Robert Greenwalt
f0bead2801 Merge "DO NOT MERGE Enhance local log." into mnc-dev 2015-07-24 19:54:07 +00:00
Amith Yamasani
8582f9f759 am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev 
* commit '21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8':
  Require permission for internal broadcast
 2015-07-24 19:47:39 +00:00
Adrian Roos
a65de4fde9 am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit 'b2f8c716e8d2cf575c690b5a360c4efdd9f06bc8':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-24 19:45:24 +00:00
Robert Greenwalt
dd6f844129 DO NOT MERGE Enhance local log. 
to be reverted with ag/733658
bug:22632129

Change-Id: Id3899ee8e987ccc469394dd4d0c41465c48dc37e
 2015-07-24 12:44:03 -07:00
Amith Yamasani
21b0b3ac43 am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev 
* commit '2c5aeeaaaaa0e048817dd04d41ae9f396bb76fb6':
  Require permission for internal broadcast
 2015-07-24 19:31:59 +00:00
Daniel Estrada Alva
66edfca46c Merge "Ensure retry of NTP refresh." 2015-07-24 19:28:46 +00:00
Amith Yamasani
2c5aeeaaaa Merge "Require permission for internal broadcast" into mnc-dev 2015-07-24 19:12:16 +00:00
Fyodor Kupolov
9008192e35 am b02f646c: am 71b4c049: am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit 'b02f646c850d02b00c379ccd445ad7d637c8c022':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 18:49:37 +00:00
Fyodor Kupolov
b02f646c85 am 71b4c049: am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit '71b4c04944b3fc7baa5e607cfd31ebc8cfef1abc':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 18:33:37 +00:00
Elliott Hughes
88c7a4ec1f am d149c9e5: aapt: expat exports its header files now. 
* commit 'd149c9e59ac7b10b6a782a7d0524ad8b2fe36b16':
  aapt: expat exports its header files now.
 2015-07-24 18:23:32 +00:00
Tor Norbye
585307a36c Merge "Annotate Intent and ContentResolver params with @RequiresPermission" 2015-07-24 18:23:01 +00:00
Fyodor Kupolov
71b4c04944 am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev 
* commit 'f9e60801073d0d3339ba948934460b77aa5e936e':
  Added ACCESS_COARSE_LOCATION permission for BT
 2015-07-24 18:18:42 +00:00
Steve McKay
47b378bbfe Merge "Update grid layout only on recView layout changes." 2015-07-24 18:12:52 +00:00