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

167362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Hall
3f2c8122f0 am 3e173290: am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '3e1732907b41e69fbd6ddb13de6f47c845cb85c0':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:30:23 +00:00
Amit Mahajan
fa72516ac9 am ed454542: am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit 'ed4545423b0166f2436adee077d11b85b62ed07a':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:30:18 +00:00
Jesse Hall
3e1732907b am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '05bbbebb475a2816d60c4a8ec140cccddc16b269':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:22:33 +00:00
Amit Mahajan
ed4545423b am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '38e48c2f477d6908d7d29503749cbe4290b013a7':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:22:28 +00:00
Geoff Mendal
411e14081f Merge "Import translations. DO NOT MERGE" 2014-10-14 01:28:31 +00:00
Jesse Hall
05bbbebb47 am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:35:45 +00:00
Amit Mahajan
38e48c2f47 am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '3547c13e0d9188b87c64082cf9756419186fd06e':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:35:40 +00:00
Jesse Hall
8d3cf106aa am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:08:31 +00:00
Amit Mahajan
3547c13e0d am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '097c8d60115a9207ba4140ef99766741a2256361':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:08:28 +00:00
Jesse Hall
d4b38fe5c0 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Alan Viverette
6f351bcc7c am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2776b17327e99338630db96d68170b0327084b3d':
  Always project ripples
 2014-10-13 21:12:43 +00:00
Alan Viverette
2776b17327 am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '204e9f4cae2d49348c121c9738f8f33b5cb20b27':
  Always project ripples
 2014-10-13 21:07:55 +00:00
Alan Viverette
204e9f4cae am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2f82e48abb71c92e41caa8057e3068dbfe96ed62':
  Always project ripples
 2014-10-13 21:03:21 +00:00
Alan Viverette
2f82e48abb Merge "Always project ripples" into lmp-mr1-dev 2014-10-13 20:58:48 +00:00
Jesse Hall
647e0df0c7 Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 2014-10-13 20:23:15 +00:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Yohei Yukawa
200ee78fe6 am d6d0c3f5: am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit 'd6d0c3f54ae6c1ddd0b1ea086aeba28cd3ac2632':
  Update config when "Show input method" is changed
 2014-10-13 19:17:22 +00:00
Mike Lockwood
59a24d6ca9 am 4dd24730: am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '4dd247305f4e4f3b3a7a9f52a8d1a9c6641391f3':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:17:17 +00:00
Michael Wright
e067549804 am d61b3014: am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit 'd61b3014b3bcc9382e3bfba5ab50c62361783e20':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:17:12 +00:00
Geoff Mendal
0536f44faa am c98998a9: (-s ours) am fdb3d6d7: (-s ours) am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c98998a903cf79d502b29eaea81601cf185a0dfd':
  Import translations. DO NOT MERGE
 2014-10-13 19:17:08 +00:00
Yohei Yukawa
d6d0c3f54a am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '84928e72e48f61644f2812a28868c9e6e91fadbe':
  Update config when "Show input method" is changed
 2014-10-13 19:11:45 +00:00
Mike Lockwood
4dd247305f am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit 'b3bab92e6b4541e0718aade2396e667b06d98358':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:11:40 +00:00
Michael Wright
d61b3014b3 am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '07dee169f4efe8f5ab10a39ebf5a41563322cecd':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:11:36 +00:00
Geoff Mendal
c98998a903 am fdb3d6d7: (-s ours) am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2':
  Import translations. DO NOT MERGE
 2014-10-13 19:11:31 +00:00
Geoff Mendal
207c828e8e am fd169d1e: (-s ours) am 3c68bde1: (-s ours) am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'fd169d1ef698992444b785617a1da1df40059bd6':
  Import translations. DO NOT MERGE
 2014-10-13 19:09:09 +00:00
Yohei Yukawa
84928e72e4 am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '9ca39d744cdf6ffdb782bbc883b2f4266545f64e':
  Update config when "Show input method" is changed
 2014-10-13 19:06:43 +00:00
Mike Lockwood
b3bab92e6b am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '0a4e2245263c594d85f7579c970c926c50bc1ede':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:06:39 +00:00
Michael Wright
07dee169f4 am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '48ca08a21c162ac3d0bea070b196604ac9283408':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:06:34 +00:00
Geoff Mendal
fdb3d6d7e3 am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '06f6b38b76490d574232b526423777d271031730':
  Import translations. DO NOT MERGE
 2014-10-13 19:06:30 +00:00
Geoff Mendal
fd169d1ef6 am 3c68bde1: (-s ours) am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca':
  Import translations. DO NOT MERGE
 2014-10-13 19:03:30 +00:00
Geoff Mendal
d13c86f482 am 17d5266e: (-s ours) am 6e69aeb9: (-s ours) am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '17d5266ea151f6292ee7720034f711d2152fa41d':
  Import translations. DO NOT MERGE
 2014-10-13 19:01:24 +00:00
Yohei Yukawa
9ca39d744c am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '540861c925df9b3743251e5d219cd5fe790f9048':
  Update config when "Show input method" is changed
 2014-10-13 18:57:58 +00:00
Mike Lockwood
0a4e224526 am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '8ca4886e439685fdcb1eff4c3552a62522ebeeb0':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:57:54 +00:00
Michael Wright
48ca08a21c am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '43a7dcc12b212ac4f00af294b13d931dca3c3f8d':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:57:50 +00:00
Geoff Mendal
06f6b38b76 am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ad12f288b1199b636c3961bb86fd11ed2749065e':
  Import translations. DO NOT MERGE
 2014-10-13 18:57:47 +00:00
Geoff Mendal
3c68bde1ce am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ce9003f7c24f44d8e1d1fee65dca444e6a61d061':
  Import translations. DO NOT MERGE
 2014-10-13 18:57:07 +00:00
Geoff Mendal
17d5266ea1 am 6e69aeb9: (-s ours) am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5':
  Import translations. DO NOT MERGE
 2014-10-13 18:55:26 +00:00
Geoff Mendal
41f31927c9 am 9c02cc81: (-s ours) am eb379bc6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '9c02cc81ef5c870f53bf663e0a695255d12c0de0':
  Import translations. DO NOT MERGE
 2014-10-13 18:53:21 +00:00
Geoff Mendal
ce9003f7c2 am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '1b77f365d63828e5111a1bec6495a06c07154771':
  Import translations. DO NOT MERGE
 2014-10-13 18:49:14 +00:00
Yohei Yukawa
540861c925 am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
 2014-10-13 18:48:16 +00:00
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00
Geoff Mendal
ad12f288b1 am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02c4a225ffa32e67255517a0275d7a4c1a738619':
  Import translations. DO NOT MERGE
 2014-10-13 18:48:03 +00:00
Geoff Mendal
6e69aeb9b2 am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd6a85f6e8466ab762377b97876257bb05a9c73d2':
  Import translations. DO NOT MERGE
 2014-10-13 18:47:40 +00:00
Geoff Mendal
9c02cc81ef am eb379bc6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'eb379bc63a0be440c733b4b3f0997123d3a6ac48':
  Import translations. DO NOT MERGE
 2014-10-13 18:47:21 +00:00
Yohei Yukawa
2dfd8d578a Merge "Update config when "Show input method" is changed" into lmp-dev 2014-10-13 18:42:50 +00:00
Mike Lockwood
317f9ce85a Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 2014-10-13 18:38:23 +00:00
Amit Mahajan
5742335cbd Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to 
signatureOrSystem.

Bug: 17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
 2014-10-13 11:38:03 -07:00
Jesse Hall
d7e559675c Surface: Leave object in unlocked state when unlockCanvasAndPost fails 
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
 2014-10-13 11:01:15 -07:00