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

162797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Geoff Mendal
1b77f365d6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 17:31:34 +00:00
Geoff Mendal
eb379bc63a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-13 17:30:40 +00:00
Michael Wright
265d3e9d3e Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev 2014-10-13 17:30:32 +00:00
Geoff Mendal
d6a85f6e84 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-13 17:28:23 +00:00
Jeff Hao
1d892dcb6b Stop boot dexopt when low on memory. 
Bug: 17641843
Change-Id: Ie1967fc2cd9bdd258bfee442968f98200edaf62e
 2014-10-13 10:27:29 -07:00
Geoff Mendal
02c4a225ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 17:22:40 +00:00
Geoff Mendal
aaefa5963e Import translations. DO NOT MERGE 
Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86
Auto-generated-cl: translation import
 2014-10-13 10:15:50 -07:00
Geoff Mendal
52ad690ac3 Import translations. DO NOT MERGE 
Change-Id: Icfc1dd20d22aabd6616b38adadb9bc03a698ae83
Auto-generated-cl: translation import
 2014-10-13 10:12:54 -07:00
Geoff Mendal
b54c175e32 Import translations. DO NOT MERGE 
Change-Id: I6ee9fab7b3887858319cb14b34a19062d72cd6b3
Auto-generated-cl: translation import
 2014-10-13 10:08:58 -07:00
Geoff Mendal
84323907e4 Import translations. DO NOT MERGE 
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
 2014-10-13 10:05:28 -07:00
Mike Lockwood
6e383350e4 Change RECEIVE_BLUETOOTH_MAP permission to signature or system 
Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
 2014-10-13 10:00:08 -07:00
Geoff Mendal
21d4b32749 am 757f1135: (-s ours) am 2bb933a5: (-s ours) am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '757f1135469175d7b7509c2ac88a620b7c189447':
  Import translations. DO NOT MERGE
 2014-10-13 14:30:36 +00:00
Geoff Mendal
757f113546 am 2bb933a5: (-s ours) am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2bb933a5129cccb29e31fe2db00109bab6805979':
  Import translations. DO NOT MERGE
 2014-10-13 14:26:19 +00:00
Geoff Mendal
2bb933a512 am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193':
  Import translations. DO NOT MERGE
 2014-10-13 14:20:20 +00:00
Geoff Mendal
862ecfa38a Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 14:17:23 +00:00
Geoff Mendal
59f3f45b5b Import translations. DO NOT MERGE 
Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976
Auto-generated-cl: translation import
 2014-10-13 07:16:34 -07:00
Geoff Mendal
86f6d4cc23 am a74a5886: (-s ours) am a362bacb: (-s ours) am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'a74a58865173f28416169adbfec92bc8573a4e89':
  Import translations. DO NOT MERGE
 2014-10-13 14:16:14 +00:00
Geoff Mendal
a74a588651 am a362bacb: (-s ours) am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'a362bacb16d31b48e6cb7a59b40252137c899862':
  Import translations. DO NOT MERGE
 2014-10-13 14:12:05 +00:00
Geoff Mendal
ff87975d05 Import translations. DO NOT MERGE 
Change-Id: I6e2cbe15ac68d085b6906d832b028d7a01875f3c
Auto-generated-cl: translation import
 2014-10-13 07:10:24 -07:00
Geoff Mendal
a362bacb16 am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit '39217055fad3ee87bf912ac9a2ad7b186cf73eb4':
  Import translations. DO NOT MERGE
 2014-10-13 14:07:49 +00:00
Geoff Mendal
810e048690 Import translations. DO NOT MERGE 
Change-Id: I975ab75d40dbb3629bd36e94058cfd4053053929
Auto-generated-cl: translation import
 2014-10-13 07:03:56 -07:00
Geoff Mendal
39217055fa am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'd700e5a37afec6c264609c5df4c3a6b783417330':
  Import translations. DO NOT MERGE
 2014-10-13 14:03:04 +00:00
Geoff Mendal
d700e5a37a Import translations. DO NOT MERGE 
Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec
Auto-generated-cl: translation import
 2014-10-13 06:57:32 -07:00
Marcin Kosiba
103817ed36 am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4c8dd87a9e952a3ca157411b1a374c83064c9b2f':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:55:22 +00:00
Marcin Kosiba
4c8dd87a9e am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '58ee8a966a14208c85ac304136a36602b2d75e01':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:50:35 +00:00