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

44449 Commits

Author SHA1 Message Date
Maggie Benthall
b964e5edff am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
Michael Jurka
6f11e3254e am 9d4d14fa: am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 
* commit '9d4d14fa292e4ef7beb66c20b0b2c139b81d3c8f':
  Add new intent/method for cropping and setting wallpapers
 2013-09-14 05:32:00 -07:00
Michael Jurka
9d4d14fa29 am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 
* commit '276e6c7a89ed91dbf3e4fe9f46d19e82656d8fd9':
  Add new intent/method for cropping and setting wallpapers
 2013-09-14 05:29:39 -07:00
Michael Jurka
276e6c7a89 Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 2013-09-14 12:25:51 +00:00
Svetoslav Ganov
860f8a6b66 Spooler should not crash if print service config activities are not exported. 
1. If a print service does not export its activities for settings and
   adding printers the print spooler ignores them instead of crashing.
   Also if the service is not enabled its activities are now ignored.

2. Added a dedicated permission for a print service to optionally
   protect its settings and add printer activities such that only the
   system can bind to them.

3. Fixed a crash in the print dialog if its content is detached
   from the window and animators are running.

bug:10680224

Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
 2013-09-14 01:00:55 -07:00
Igor Murashkin
e3351f1942 media: Update ImageReader to remove MaxImagesAcquiredException 
* acquiring images now throws IllegalStateException instead of
    MaxImagesAcquiredException

Bug: 10691447
Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
 2013-09-13 23:27:44 -07:00
Baligh Uddin
e9772829a8 Import translations. DO NOT MERGE 
Change-Id: Ic7a81b3719ad13cff68fec7172926e6c894b18f8
Auto-generated-cl: translation import
 2013-09-13 21:35:08 -07:00
Baligh Uddin
c2d91d5a31 Import translations. DO NOT MERGE 
Change-Id: Ic9f16e364544b1366e92d26552b27a01dc1d57c5
Auto-generated-cl: translation import
 2013-09-13 21:14:47 -07:00
Chet Haase
69d9cd7c37 am 140f3dff: am 750ce3ac: Merge "Only buildLayer() on attached views" into klp-dev 
* commit '140f3dff592a93cf5ace2c3a2830c56933b5bc54':
  Only buildLayer() on attached views
 2013-09-13 20:44:21 -07:00
Chet Haase
140f3dff59 am 750ce3ac: Merge "Only buildLayer() on attached views" into klp-dev 
* commit '750ce3acf23e5c2e5b239154a2539391544f9463':
  Only buildLayer() on attached views
 2013-09-13 20:42:25 -07:00
Chet Haase
750ce3acf2 Merge "Only buildLayer() on attached views" into klp-dev 2013-09-14 03:39:45 +00:00
Matthew Williams
8ef2204c8f Refactor SyncManager rename authority->target 
fix bug that was stopping any sync service sync from
from taking place.
Change-Id: Ib3f46d43be630d4196fbf0ca32da03b6e7a6a5b9
 2013-09-13 19:22:50 -07:00
Geoff Mendal
84443425e2 am 6689c674: am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev 
* commit '6689c674d9eb7aa62596b362f87e2d06e10d44ef':
  Disable ActionBar transitions
 2013-09-13 19:11:52 -07:00
Geoff Mendal
6689c674d9 am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev 
* commit 'c028d8f05c0cf32489bd369ce5612ce6a4077e7a':
  Disable ActionBar transitions
 2013-09-13 19:09:47 -07:00
Geoff Mendal
c028d8f05c Merge "Disable ActionBar transitions" into klp-dev 2013-09-14 02:08:20 +00:00
Chet Haase
5fd37236df Only buildLayer() on attached views 
A recent change to ViewPropertyAnimator.withLayer() builds the layer
immediately after creating it. This works in general, but if the view
is not attached, buildLayer() throws an exception.

The fix is to ensure that the view is attached before calling buildLayer().

Issue #10750925 Dialer crashed and phone dropped while on call

Change-Id: I801c835a0f5cb81e159fe90c157c122cf2d0da01
 2013-09-13 19:01:52 -07:00
Chet Haase
7d077d0364 Disable ActionBar transitions 
A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.

Issue #10726905 ActionBar weirdness in People app

Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
 2013-09-13 18:51:12 -07:00
Dianne Hackborn
14520b79fa am 38743f2a: am e39ced0f: Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 
* commit '38743f2a67259d8eab55c70cee7709ad7aac6e8f':
  Maybe fix issue #10748810: Runtime restart: crash under...
 2013-09-13 18:48:05 -07:00
Dianne Hackborn
38743f2a67 am e39ced0f: Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 
* commit 'e39ced0f7cb236759b45eeaefddcd578e2cfcf8d':
  Maybe fix issue #10748810: Runtime restart: crash under...
 2013-09-13 18:45:39 -07:00
Dianne Hackborn
e39ced0f7c Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 2013-09-14 01:43:20 +00:00
Dianne Hackborn
a0332377e1 Maybe fix issue #10748810: Runtime restart: crash under... 
...ActivityManagerService.setProcessTrackerState

And if not, at least we'll have a little more debug info
when it happens again.

Change-Id: I685f0f72c2e1b17608a8d069d6c7f2cff2fd0abd
 2013-09-13 18:34:13 -07:00
Alan Viverette
d17e719da0 Merge "Clean up layout constructors, make them consistent" 2013-09-14 01:22:45 +00:00
Scott Main
26c5baf41d am 7e876482: am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '7e87648232e955629375c6ae047b9c2faceaa67e':
  more javadocs for onTrimMemory()
 2013-09-13 18:17:10 -07:00
Scott Main
7e87648232 am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '296fbce89c066099bbf4f3828cf8ed797acebdfb':
  more javadocs for onTrimMemory()
 2013-09-13 18:13:51 -07:00
Dianne Hackborn
3f7867b603 am 570d0ca3: am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 
* commit '570d0ca39cd8d11faf7cc453cfd8096e07c3877b':
  Implement #10666712: NetworkOnMainThreadException should be...
 2013-09-13 18:10:19 -07:00
David Christie
6180e84410 am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '691a3191e3efb11f0607c45f29e460d2baf8188e':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:10:16 -07:00
Scott Main
296fbce89c am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit 'bb3b431dc6b5786bed7cc988f44c35df21408a93':
  more javadocs for onTrimMemory()
 2013-09-13 18:09:45 -07:00
Dianne Hackborn
570d0ca39c am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 
* commit 'fc9122ecae06339283602bdc78c5d704d95e3f29':
  Implement #10666712: NetworkOnMainThreadException should be...
 2013-09-13 18:06:59 -07:00
David Christie
691a3191e3 am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '5f68f717019433ce4fa284386ba48bd1b571073a':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:06:56 -07:00
Scott Main
bb3b431dc6 am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
  more javadocs for onTrimMemory()
 2013-09-13 18:06:28 -07:00
Dianne Hackborn
fc9122ecae Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 2013-09-14 01:04:05 +00:00
Scott Main
8bf0c9ae60 am a23fd887: more javadocs for onTrimMemory() 
* commit 'a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
  more javadocs for onTrimMemory()
 2013-09-13 18:03:18 -07:00
David Christie
5f68f71701 Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 2013-09-14 01:02:40 +00:00
Scott Main
a23fd88729 more javadocs for onTrimMemory() 
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
 2013-09-13 17:57:16 -07:00
David Christie
6ab2284c98 Strip names out of externally supplied WorkSources to WifiManager (b/10710007). 
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
 2013-09-13 17:34:40 -07:00
Dianne Hackborn
7e7144218e Implement #10666712: NetworkOnMainThreadException should be... 
...relayed back to calling application

What's one more exception between friends?

Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
 2013-09-13 17:32:57 -07:00
Adam Powell
3934b9f520 am db34f3d1: am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev 
* commit 'db34f3d17d0d2b6eaad8369536dcbb1025d0a00c':
  Check RelativeLayout's access of its own LayoutParams during measurement
 2013-09-13 17:32:21 -07:00
Dianne Hackborn
e054986657 am 5b7359aa: am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '5b7359aa442a120c2853a05bc987c501da659df2':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:32:18 -07:00
Adam Powell
f206b5935e am 3cfc5995: am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 
* commit '3cfc5995bfa5d9d4c9203991131d76947c572b58':
  Don't recycle action button views
 2013-09-13 17:30:48 -07:00
Rachad Alao
1f54af0996 am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '00b3f942e45f08b4f1e86a6c9c8cdaecf4efecc4':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:30:45 -07:00
Jeff Sharkey
be9e10a26d am 56cb98e8: am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '56cb98e8f122f202f76e9b9cc072a72b80ef6600':
  More UX updates around picking images.
 2013-09-13 17:30:41 -07:00
Vineeta Srivastava
6a60c7bd4e am 2089abdf: am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '2089abdf787df5a179db6486f39441c57db82833':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:30:33 -07:00
Dianne Hackborn
1cd9a73ac0 am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:30:31 -07:00
Zhihai Xu
078c1f3606 am a33ebcb9: am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit 'a33ebcb9edd5d8a8148d9080d2bf48b76d2b93fb':
  Fixed review comments
 2013-09-13 17:30:27 -07:00
Adam Powell
db34f3d17d am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev 
* commit '50e5814c337f67c74d9e249cf6f67ac86dfc832d':
  Check RelativeLayout's access of its own LayoutParams during measurement
 2013-09-13 17:26:27 -07:00
Dianne Hackborn
5b7359aa44 am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '76adfd71f1ebdf50a03c85e2a7c87d5691f81b13':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:26:24 -07:00
Adam Powell
50e5814c33 Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev 2013-09-14 00:23:07 +00:00
Jason Monk
103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:22:53 -07:00
Christopher Tate
9b6c9a1592 am fcda3283: am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit 'fcda3283d27f8dfaa812fb735af43eea2e077c64':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:22:45 -07:00