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

198567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Langemak
02565c3622 Merge changes from topic 'fix-notification-inflation-2' into mnc-dev 
* changes:
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
 2015-07-31 02:52:30 +00:00
Hung-ying Tyan
410abcdb41 Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev 2015-07-31 02:51:32 +00:00
Geoff Mendal
44718c4b8b am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'bbb47d88d5f129ab1ca30d6a7a41976e47681e37':
  Import translations. DO NOT MERGE
 2015-07-31 02:45:21 +00:00
Ronghua Wu
0278f2bf2d am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev 
* commit 'e8b7febd62f899ed8920cbd484e18dea64b3a7ee':
  media: use blocks number to find closest size
 2015-07-31 02:40:28 +00:00
Geoff Mendal
bbb47d88d5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-31 02:38:23 +00:00
Dan Sandler
4b67713709 Make DateTimeView more robust to weird contexts. 
In particular, some clients (*ahem* SystemUI) have been
known to inflate RemoteViews with unusual derived contexts
that may not have valid application contexts. DateTimeView
can now resist this.

Bug: 22852700
Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
 2015-07-30 22:33:12 -04:00
Dan Sandler
706274f7ff Make the RemoteViews context safe for Icons. 
Icon needs the RemoteViews' internal context to reflect not
just the Resources of the originating application, but its
package name as well.

Bug: 22840771
Bug: 22852700
Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
 2015-07-30 22:32:54 -04:00
Ronghua Wu
e8b7febd62 Merge "media: use blocks number to find closest size" into mnc-dev 2015-07-31 02:32:53 +00:00
Geoff Mendal
84ddee2e53 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: I1c6a84cee28d64dad3b53e727252d237824b673d
 2015-07-30 19:15:21 -07:00
Geoff Mendal
e0217b1a9a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
 2015-07-30 19:12:14 -07:00
Lorenzo Colitti
ffc42b0b7b Stop supporting legacy ConnectivityManager routing methods in M. 
The methods startUsingNetworkFeature, stopUsingNetworkFeature and
requestRouteToHost were @removed in all the M preview builds, but
internal and external developers have noted that this imposes
additional burden for applications that need to work across
multiple platform versions because it causes compile-time errors.

We switched from @removed back to @deprecated to avoid these
problems. In order to effectively deprecate these methods, which
are error-prone and insecure, make them throw
UnsupportedOperationException if the app's target SDK is M or
above.

Because there are still one or two places in system code that use
these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from
the check for now.

Bug: 22728205
Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
 2015-07-31 11:08:27 +09:00
Jeff Sharkey
0eaadbc2a9 am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev 
* commit '5db4cc8fee8b919b5f62f222af92a4e995ca6a70':
  Handle volumes without visible paths.
 2015-07-31 01:51:37 +00:00
Jeff Sharkey
5db4cc8fee Merge "Handle volumes without visible paths." into mnc-dev 2015-07-31 01:46:45 +00:00
Jeff Sharkey
865ea7c800 Handle volumes without visible paths. 
Transient volumes like USB drives are not mounted as visible, so we
shouldn't be kicking off media scanner for them.

Bug: 22545248
Change-Id: Ic8f2d3134f1edb8b2a12e8ff283eceeeb230f48b
 2015-07-30 18:10:39 -07:00
Adam Lesinski
15724ffc41 am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev 
* commit 'e3b0119f79d11744a7f590510b184feef0f45894':
  AAPT: Fix resource versioning
 2015-07-31 00:35:18 +00:00
Adam Lesinski
e3b0119f79 Merge "AAPT: Fix resource versioning" into mnc-dev 2015-07-31 00:28:05 +00:00
Selim Cinek
5b5d912913 am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev 
* commit 'b9f30b26707b7e8721b1cd03ca96b5a4a4995109':
  The heads up now correctly dissapears when clicking
 2015-07-31 00:08:00 +00:00
Selim Cinek
b9f30b2670 Merge "The heads up now correctly dissapears when clicking" into mnc-dev 2015-07-30 23:59:59 +00:00
Amit Mahajan
135e2ce571 am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev 
* commit '53c750142332cb33e604266b7c6d09191c32691c':
  Add OrSelf to privileged permission check.
 2015-07-30 23:58:34 +00:00
Adam Lesinski
ee6046add1 am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 
* commit '00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
  BatteryStats: include mobile radio active count and unknown time in checkin
 2015-07-30 23:58:30 +00:00
Amit Mahajan
53c7501423 Merge "Add OrSelf to privileged permission check." into mnc-dev 2015-07-30 23:54:06 +00:00
Adam Lesinski
00f7cb924e Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 2015-07-30 23:50:27 +00:00
Adam Lesinski
782327bde7 BatteryStats: include mobile radio active count and unknown time in checkin 
These are important values to help diagnose modem related wakeup issues.

Bug:22803686
Bug:22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
 2015-07-30 23:50:10 +00:00
Andre Eisenbach
7b3f6d5683 am 3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast 
* commit '3bf1ac54edc77d2249dc9a0ab8291efa70ff76b9':
  Bluetooth: Don't call beginBroadcast() while in a broadcast
 2015-07-30 23:47:30 +00:00
Selim Cinek
0fccc729fd The heads up now correctly dissapears when clicking 
Bug: 22729955
Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
 2015-07-30 23:05:42 +00:00
Amit Mahajan
a9e72a7653 Add OrSelf to privileged permission check. 
Bug: 22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d
 2015-07-30 16:04:13 -07:00
Andre Eisenbach
3bf1ac54ed Bluetooth: Don't call beginBroadcast() while in a broadcast 
Block duplicate calls to beginBroadcast() and add try/finally
to ensure finishBroadcast() is always called.

Bug: 22800686
Change-Id: Ie8d4005f4cd50dd2544a2832773d72eab0015d92
 2015-07-30 22:30:42 +00:00
Carlos Valdivia
e195d17949 am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev 
* commit '26ae600b5fb8c657b4f8dc2700374c701c9e50ec':
  Permissions: GET_ACCOUNTS permission cleanup
 2015-07-30 22:07:31 +00:00
Deepanshu Gupta
3991bea8ae am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev 
* commit '7676e403bd65435eb3d2f34e7e0174fd37f6e818':
  Update status bar time.
  Fix imports.
  Add MockView constructor used by LayoutInflater.
  Poor implementation of Path.approximate()
  Include EpicenterTranslateClipReveal in LayoutLib
  Fix theme namespace in tests.
  LayoutLib: fix layout when nav bar is absent.
  LayoutLib: Fix Status/Navigation Bar color.
 2015-07-30 22:07:27 +00:00
Carlos Valdivia
26ae600b5f Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev 2015-07-30 21:58:16 +00:00
Deepanshu Gupta
7676e403bd Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev 
* changes:
  Update status bar time.
  Fix imports.
  Add MockView constructor used by LayoutInflater.
  Poor implementation of Path.approximate()
  Include EpicenterTranslateClipReveal in LayoutLib
  Fix theme namespace in tests.
  LayoutLib: fix layout when nav bar is absent.
  LayoutLib: Fix Status/Navigation Bar color.
 2015-07-30 21:58:03 +00:00
Selim Cinek
fb2f9c0209 am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev 
* commit '20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
  Fixed a heads up crash
 2015-07-30 21:54:35 +00:00
Selim Cinek
20a5d33175 Merge "Fixed a heads up crash" into mnc-dev 2015-07-30 21:45:55 +00:00
Phil Burk
e2823cb3db am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev 
* commit '8f5228afe671b5e80fab4d1c55452ad6c83ef4f1':
  UsbMidiDevice: add timestamps for input events
 2015-07-30 21:41:03 +00:00
Phil Burk
3eb4583600 am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 
* commit '2f1a08e601f4fa24e589fc61ea38f80eb264a8f4':
  MIDI docs BTLE: how to open BTLE MIDI devices
 2015-07-30 21:40:58 +00:00
Phil Burk
9d4fad246f am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 
* commit 'fdcd82164f95699c36e044f90a12b9aa1c4f662f':
  MIDI package doc: add hasSystemFeature() call
 2015-07-30 21:40:53 +00:00
Phil Burk
6bf9b8ca59 am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev 
* commit '559a2420d396ef7a7c7bcab012bef379ad864bff':
  MidiDevice: document that opens can return nulls
 2015-07-30 21:40:46 +00:00
Phil Burk
8f5228afe6 Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev 2015-07-30 21:28:17 +00:00
Phil Burk
2f1a08e601 Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 2015-07-30 21:27:47 +00:00
Phil Burk
fdcd82164f Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 2015-07-30 21:27:25 +00:00
Phil Burk
559a2420d3 Merge "MidiDevice: document that opens can return nulls" into mnc-dev 2015-07-30 21:26:48 +00:00
Tyler Gunn
335ff2ec7a Add telecom extra keys required for DMR release. 
Bug: 22848290
Change-Id: I3328234e3f07d83d0dbe5b61b959344b6cc5cc3f
 2015-07-30 14:18:33 -07:00
Fyodor Kupolov
f9fdb08caa am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 
* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
  Introduced android.permission.PEERS_MAC_ADDRESS permission
 2015-07-30 20:58:29 +00:00
Aravind Akella
ccaf066d6d Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev 2015-07-30 20:57:54 +00:00
Fyodor Kupolov
4988378cd0 Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 2015-07-30 20:50:04 +00:00
Shawn Willden
8e0c9befad am 75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev 
* commit '75e51ec0b14e9c5363ad86a69fd7a764290a5cfb':
  Raw RSA Cipher relies on keymaster for padding and range checks.
 2015-07-30 20:03:09 +00:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size 
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
 2015-07-30 13:01:20 -07:00
Shawn Willden
75e51ec0b1 Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev 2015-07-30 19:57:22 +00:00
Chris Craik
7dfb1d9931 am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev 
* commit '730c0f6591b1c99699e9d0ecf36d696f7d87629f':
  Fix stencil mask usage in HWUI
 2015-07-30 19:37:15 +00:00
Chris Craik
730c0f6591 Merge "Fix stencil mask usage in HWUI" into mnc-dev 2015-07-30 19:30:58 +00:00