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

212125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pirama Arumuga Nainar
05f0dc2891 am d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation." 
* commit 'd59921149bb5948ffbcb9a9e832e9ac1538e05a0':
  Fix punctuation and typos in AllocationAdapter's documentation.
 2015-10-09 17:03:14 +00:00
Pirama Arumuga Nainar
d59921149b Merge "Fix punctuation and typos in AllocationAdapter's documentation." 2015-10-09 16:57:54 +00:00
Pirama Arumuga Nainar
1078942ed8 Safely handle interrupts during Thread.join() 
Bug: 24342101

Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit 83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
 2015-10-08 20:14:51 -07:00
Pirama Arumuga Nainar
93db3d4bfd Retry if interrupted before mMessageThread has joined 
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit 2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
 2015-10-08 20:13:50 -07:00
Filip Gruszczynski
e76aa2275b am 0b45c2f8: am 21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe" 
* commit '0b45c2f87c0285b42eef96bbb8950d225334c60e':
  Make accessing mInputMethodTarget thread-safe
 2015-10-09 00:01:09 +00:00
Filip Gruszczynski
0b45c2f87c am 21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe" 
* commit '21b37a5fb46f3dcd20bba0c621d8859e1c8dc32e':
  Make accessing mInputMethodTarget thread-safe
 2015-10-08 23:54:13 +00:00
Filip Gruszczynski
21b37a5fb4 Merge "Make accessing mInputMethodTarget thread-safe" 2015-10-08 23:50:17 +00:00
Anthony Hugh
979b81ac33 Give Android Wear system apps default permission 
This change grants Android Wear system components default
permission.

I have also added a new Intent category to help identify
the main Home handler on Wear.

BUG: 23419042
Change-Id: Ie669a9908bd3b03498f75c5ca22c0fddf52a5203
 2015-10-08 16:34:28 -07:00
Jason Monk
b2fae9bf2a am 4e33c1c3: am 3a409081: am 29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev 
* commit '4e33c1c312be549ca155b35b24938076ef30f414':
  Actually apply after no sims change.
 2015-10-08 20:38:03 +00:00
Jason Monk
4e33c1c312 am 3a409081: am 29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev 
* commit '3a40908185f7db6488f773fe2060a10c00db74db':
  Actually apply after no sims change.
 2015-10-08 20:31:51 +00:00
Jason Monk
3a40908185 am 29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev 
* commit '29433f701f6722e1f175dd3b735ed025309907b0':
  Actually apply after no sims change.
 2015-10-08 20:28:10 +00:00
Jason Monk
29433f701f Merge "Actually apply after no sims change." into mnc-dr-dev 2015-10-08 20:21:00 +00:00
Pirama Arumuga Nainar
115b4117a0 Fix punctuation and typos in AllocationAdapter's documentation. 
Change-Id: I5574ff201b857a29f30ebe8413dbe4128dcff3ae
 2015-10-08 19:51:11 +00:00
Jeff Sharkey
386d790046 am e0210648: am a0ef1048: am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev 
* commit 'e0210648d82a4816218e057a6bf52ee946ee9530':
  Hold wake-lock during copy operations.
 2015-10-08 17:23:11 +00:00
Jeff Sharkey
e0210648d8 am a0ef1048: am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev 
* commit 'a0ef104882b1a0edd79badb2f327cc8722f76bb2':
  Hold wake-lock during copy operations.
 2015-10-08 17:09:29 +00:00
Jeff Sharkey
a0ef104882 am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev 
* commit 'd473a1446e520616c4079594bbcf3c6fbe88ed4f':
  Hold wake-lock during copy operations.
 2015-10-08 17:02:38 +00:00
Jeff Sharkey
d473a1446e Merge "Hold wake-lock during copy operations." into mnc-dr-dev 2015-10-08 16:58:54 +00:00
Jason Monk
64f4f9887a Actually apply after no sims change. 
Bug: 24244260
Change-Id: I922d45e6dcc4eb85fc7d93824e7d01645a90266e
 2015-10-08 10:09:21 -04:00
Puneet Kumar
f975a26bfe am d621ee11: am edc3585f: am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev 
* commit 'd621ee11fa76d7dd803a802bf000baa591c84fbe':
  Add ESC mapping for Pixel C keyboard
 2015-10-08 09:20:01 +00:00
Puneet Kumar
2a370c4932 am 0068ea5b: am 8810285f: am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev 
* commit '0068ea5bf7c9988174b0991eb87bb09f5838c39c':
  Add layout and keymap for Pixel C Bluetooth keyboard
 2015-10-08 09:19:55 +00:00
Puneet Kumar
d621ee11fa am edc3585f: am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev 
* commit 'edc3585ffd1ce17f12b808f0473ebc582e159132':
  Add ESC mapping for Pixel C keyboard
 2015-10-08 09:15:31 +00:00
Puneet Kumar
0068ea5bf7 am 8810285f: am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev 
* commit '8810285fa54f788cc78ae7777db8ccfe57436e30':
  Add layout and keymap for Pixel C Bluetooth keyboard
 2015-10-08 09:15:25 +00:00
Puneet Kumar
edc3585ffd am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev 
* commit '0a1f0e56b4ea8c78a1fac3218cfa4efa4cbe3117':
  Add ESC mapping for Pixel C keyboard
 2015-10-08 09:08:30 +00:00
Puneet Kumar
8810285fa5 am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev 
* commit '06d1254c9b63f0f3304ef4dd1de8602655ef9a3f':
  Add layout and keymap for Pixel C Bluetooth keyboard
 2015-10-08 09:08:26 +00:00
Puneet Kumar
0a1f0e56b4 Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev 2015-10-08 08:17:38 +00:00
Puneet Kumar
06d1254c9b Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev 2015-10-08 08:17:23 +00:00
Lorenzo Colitti
025f4a5aae Support DHCP replies with multiple default gateways. 
Just use the first one for compatibility with the legacy client.

Bug: 23975855
Change-Id: Id6a0b0de32e8947c12c02eb9a3be417e2f82c99a
 2015-10-08 16:28:02 +09:00
Erik Kline
b19238c488 Accept DHCP responses from non-67 server source ports 
Bug: 24687559
Change-Id: I5f03b8b2780c558281d8a50d0893fd64f2812add
 2015-10-08 15:40:41 +09:00
Erik Kline
496906ee70 Improve logging of DHCP parse errors using exceptions. 
Bug: 23975855
Change-Id: I62464b92f0bb568e57bf5e1a63bc75f22c75aac1
 2015-10-08 15:40:31 +09:00
Tim Murray
b2387e650b am 6c271b89: am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 
* commit '6c271b898c080303c24e524022dd6e4552bda5f5':
  Ensure SurfaceView requests WM relayout when size changes.
 2015-10-07 23:39:16 +00:00
Tim Murray
6c271b898c am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 
* commit 'f3acc63015cb3093c3bdc11f6dbd1db2f375eeca':
  Ensure SurfaceView requests WM relayout when size changes.
 2015-10-07 23:32:28 +00:00
Tim Murray
f3acc63015 am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 
* commit '0135690688c8285e022a2a8191c8582f2e6ea759':
  Ensure SurfaceView requests WM relayout when size changes.
 2015-10-07 23:28:13 +00:00
Chien-Yu Chen
c1a1343933 am d07d0071: am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit 'd07d007161e2f64e88eba9f78778ab63b3dd6ab9':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:22:24 +00:00
Tim Murray
0135690688 Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 2015-10-07 23:21:14 +00:00
Chien-Yu Chen
d07d007161 am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit '02e4400cc734079bcc275d14a9ae4d16609403c8':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:17:39 +00:00
Chien-Yu Chen
02e4400cc7 am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:11:20 +00:00
Chien-Yu Chen
ab7812750b Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 2015-10-07 23:03:52 +00:00
Chien-Yu Chen
d890f4f400 MediaActionSound: Fix video stop sound 
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
 2015-10-07 15:17:19 -07:00
Yin-Chia Yeh
cbb3dc67cf am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string 
* commit '527da81f13fa65b924859ae87f6ccce8d3614140':
  Camera: fix wrong FULL feature string
 2015-10-07 21:54:41 +00:00
Yin-Chia Yeh
527da81f13 am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string 
* commit 'a71bb6b986156b8bd32e387afc74b1ff066fd2a7':
  Camera: fix wrong FULL feature string
 2015-10-07 21:50:17 +00:00
Yin-Chia Yeh
a71bb6b986 am 9d688336: am a636be6c: Camera: fix wrong FULL feature string 
* commit '9d68833686e04ff5ff910a9d90fe99bc1347aaca':
  Camera: fix wrong FULL feature string
 2015-10-07 21:41:38 +00:00
Yin-Chia Yeh
9d68833686 am a636be6c: Camera: fix wrong FULL feature string 
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
  Camera: fix wrong FULL feature string
 2015-10-07 21:36:35 +00:00
Deepanshu Gupta
d7b7e93a47 am 9969f858: LayoutLib: Fix ring rendering. 
* commit '9969f858c34ba7e35a977c819f2d1e24de586990':
  LayoutLib: Fix ring rendering.
 2015-10-07 21:23:43 +00:00
Robert Carr
57caeb5703 Ensure SurfaceView requests WM relayout when size changes. 
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).

Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
 2015-10-07 20:39:11 +00:00
Deepanshu Gupta
9969f858c3 LayoutLib: Fix ring rendering. 
Bug: http://b.android.com/65503
Change-Id: I6ed901703cffee345f3083ea3ddeb52a28f4ac64
 2015-10-07 12:46:15 -07:00
Snild Dolkow
3875bf6c04 Handle 'root' pseudo-package in the appops command 
The AppOpsService handles the 'root' pseudo-package as any other; it
gets no automatic allowances. This is reasonable, but it blocked me from
accessing the mms-sms provider through the 'content' command, even in a
root shell.

So I tried to change the rules:

$ adb root
$ adb shell appops set root WRITE_SMS allow
Error: No UID for root in user 0

This error occurs in the appops command because there isn't really a
package called root, so the UID lookup via PackageManager fails.

But we know that root is UID 0, so we can just skip the lookup.
(Also, AppOpsService handles the other way around in getOpsLocked method.)

Change-Id: Ie0cad67efa438a74a4d9921d29933610cfb13974
 2015-10-07 19:58:17 +02:00
Mårten Kongstad
7197d91eb7 RRO: idmap: fix sorting of overlays.list 
Multiple overlay packages with targetPackage="android" are loaded in the
wrong order due to the incorrect order they are listed in overlays.list.
This will cause runtime resource overlay to fail when multiple overlay
packages target the same resources in framework-res.apk.

Correct the order in which overlays are loaded by changing the sorting
of overlays.list.

Background: commit f90f2f8d changed the order in which overlay packages
should be added to ResTables. The expected order is now in ascending
priority. This must be reflected in overlays.list.

Change-Id: I249984c0e34b6009e7280ce2777750c76ab16e37
 2015-10-07 19:51:50 +02:00
Mårten Kongstad
83ab0d7c18 Make 'idmap --scan' accept more than one input directory 
The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.

Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
 2015-10-07 19:45:09 +02:00
Deepanshu Gupta
24ca6320b8 am 8db8bc63: Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev 
* commit '8db8bc63624bbd1d803e02571fa865f1f7fa584c':
  Skip drawing empty shapes to keep Apple JRE happy.
 2015-10-07 17:17:02 +00:00
Deepanshu Gupta
8db8bc6362 Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev 2015-10-07 17:08:30 +00:00