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

11604 Commits

Author SHA1 Message Date
Victoria Lease
06e2a03a33 am 98ef010d: am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '98ef010daf522ab4e83dac6a03fe84c41e04aef1':
  fix crashing apps
 2012-10-15 15:57:05 -07:00
Victoria Lease
98ef010daf am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit 'aca6527ed6d7b27ca80c0b8d8be8928df597a951':
  fix crashing apps
 2012-10-15 15:55:50 -07:00
Victoria Lease
aca6527ed6 am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
  fix crashing apps
 2012-10-15 15:52:53 -07:00
Victoria Lease
3f840c8c3c Merge "fix crashing apps" into jb-mr1-dev 2012-10-15 15:50:00 -07:00
Victoria Lease
da479c5f8c fix crashing apps 
Bug: 7349330
Change-Id: Iea61bce23cb197c7a28d574098253823df73a99b
 2012-10-15 15:24:16 -07:00
Jeff Sharkey
227f782b4f am 288c3280: am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit '288c32805bec0c376c111bd9851b677c00e78afd':
  Protect more service dump() methods.
 2012-10-15 14:08:45 -07:00
Jeff Sharkey
288c32805b am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit 'ec8d1280ac70245dcc533054b748f794f33f85bd':
  Protect more service dump() methods.
 2012-10-15 14:06:09 -07:00
Jeff Sharkey
ec8d1280ac am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit '532c9c4543135463ee1f39b282d3156a3e226d50':
  Protect more service dump() methods.
 2012-10-15 14:03:53 -07:00
Jeff Sharkey
532c9c4543 Merge "Protect more service dump() methods." into jb-mr1-dev 2012-10-15 14:01:57 -07:00
Robert Greenwalt
f782833244 am af614e7d: am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'af614e7d3c28409cd1a9e53b3e6b5d6bc524f40f':
  Monitor the right interface re VPN
 2012-10-15 11:40:40 -07:00
Robert Greenwalt
af614e7d3c am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit '4e579b5ac23fc2eda314fb43600c83ebc3eb2cd0':
  Monitor the right interface re VPN
 2012-10-15 11:38:41 -07:00
Robert Greenwalt
4e579b5ac2 am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN
 2012-10-15 11:37:13 -07:00
Robert Greenwalt
a30d969401 Merge "Monitor the right interface re VPN" into jb-mr1-dev 2012-10-15 11:34:13 -07:00
Jeff Sharkey
52801aae89 Protect more service dump() methods. 
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
 2012-10-15 10:59:51 -07:00
Dianne Hackborn
49c762f79a am 547c20df: am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '547c20dfc88c7981449fcfdecf7deaa17d6fedc2':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:50:32 -07:00
Dianne Hackborn
547c20dfc8 am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '48f6b7e228f4b18181756b7c97df094b86a550aa':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:48:12 -07:00
Dianne Hackborn
48f6b7e228 am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:46:39 -07:00
Robert Greenwalt
53c04bdd35 Monitor the right interface re VPN 
Must remember the outer interface - undoes a change from a
couple months ago that broke things.

bug:7336302
Change-Id: Ia4f60862c60f3078853e151980e09cbf22a57222
 2012-10-12 17:02:45 -07:00
Dianne Hackborn
861a3b2d4f Revert fix to issue #6880627: PendingIntent.getService() returns... 
...stale intent of force stopped app

Fixing this caused other problems elsewhere that we don't have time
to address at this point.

Fixes issue #7338275: Tapping clock home screen widget doesn't open
alarms anymore

Change-Id: Iedc1fae5f62b6ead28d1895d709591358e5d6634
 2012-10-12 15:25:20 -07:00
Jeff Sharkey
102dc1cb21 am 250a90ca: am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '250a90cacf25fb277a5b778039965a330a0376d0':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:55:11 -07:00
Jeff Brown
5f104da0a8 am 82c1b13e: am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '82c1b13e8a2d2544bbab173becf215a6252d5454':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:55:07 -07:00
Winson Chung
d578b38566 am dffd302f: am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit 'dffd302f7d07a7d31f40acd3edb223476b9b9395':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 17:53:20 -07:00
Jeff Brown
63ac2d1263 am 15aa543a: am 65d8433f: am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '15aa543a58299d41ce7d44abd31f708dd3e64965':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 17:53:16 -07:00
Jeff Brown
943d52f6f2 am 44877a16: am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '44877a16e7313e0523975b5511107631fabc8115':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:53:12 -07:00
Craig Mautner
e75ded7c0d am 567f47b8: am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit '567f47b8aa0789c1631e9a5a275c787d1eee2311':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:53:08 -07:00
Winson Chung
5d8080f8b8 am ef36a549: am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'ef36a5494249c57855a5eabd6a5536d8447c1b68':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:52:47 -07:00
Svetoslav Ganov
4cc7342daf am cf19242d: am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit 'cf19242d7b9688220cf821fe598de35d932ca2d2':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 17:52:43 -07:00
Svetoslav Ganov
7510e4820b resolved conflicts for merge of a7f38925 to master 
Change-Id: If0e3a1046dfeef9260284e84f2a74525ddea00f7
 2012-10-11 17:49:28 -07:00
Jeff Sharkey
250a90cacf am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '49db71e962b8ae17a3698534c800ea7511060dac':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:28:57 -07:00
Jeff Brown
82c1b13e8a am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '1984e8c0965151750c61825c22a27a39bc402471':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:27:18 -07:00
Jeff Sharkey
49db71e962 am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '810df8951eb4bbe77f150483208f04daadac5dd9':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:25:50 -07:00
Jeff Brown
1984e8c096 am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '3da6c219a8b1acebbfd8a56ee31b5d91d0425dc4':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:23:55 -07:00
Jeff Sharkey
810df8951e Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 2012-10-11 17:21:23 -07:00
Jeff Brown
3da6c219a8 Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 2012-10-11 17:17:06 -07:00
Winson Chung
dffd302f7d am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit 'a58800d153f2a3db963ccbf9347eeccf855ed421':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 17:13:17 -07:00
Jeff Brown
15aa543a58 am 65d8433f: am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '65d8433f7be3310bd7847fc5521cbe8fd27acc0a':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 17:13:12 -07:00
Jeff Brown
44877a16e7 am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '35499475d238b6f4f5a07fd59dcddc4bc391f0d8':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 17:13:08 -07:00
Craig Mautner
567f47b8aa am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit 'a37994b2b4e2fe02c93c40699442c7a13052c57c':
  Check for apps closing and restore mExiting test.
 2012-10-11 17:13:03 -07:00
Winson Chung
ef36a54942 am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev 
* commit 'f0a8045e727e9bff08b4890521912afc6564a895':
  Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
 2012-10-11 17:12:26 -07:00
Svetoslav Ganov
cf19242d7b am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev 
* commit '756cf7e88294905f0dfa6a25981e0592e1df1689':
  Screen magnification does not auto-pan when fragment dialog pops up.
 2012-10-11 17:12:22 -07:00
Svetoslav Ganov
a7f38925f7 am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev 
* commit 'd3e5180f7cec9df97e983f228aa753efcd193013':
  Prevent out of range magnification scale to be persisted.
 2012-10-11 17:11:37 -07:00
Jeff Brown
11159e9a78 Do not launch Somnambulator as a dock app. 
Fixes a black flash that occurred when the device was docked
because the UiModeManagerService was launching the Somnambulator
to start the dream when docked.  This caused an unnecessary
activity transition and could in fact make dreaming less
reliable than if the UiModeManagerService started the dream itself.

Moved common code from UiModeManagerService and Somnambulator
to Sandman to ensure it is kept in sync.

Bug: 7328545
Change-Id: I46102784e2ab1acc0241d43a48abf0581278af24
 2012-10-11 16:29:41 -07:00
Jeff Sharkey
38f8688bae Return ApplicationInfo with requested userId. 
Return ApplicationInfo with requested userId instead of trying to
infer it from calling UID.

Bug: 7334712
Change-Id: I9ce0061e2d020b0d74c7c9cd22d89c5ff2466a6c
 2012-10-11 16:10:23 -07:00
Winson Chung
a58800d153 am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 
* commit '4cce397c0dab44cf7b1b657d0e5410b5970eef55':
  Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
 2012-10-11 14:58:47 -07:00
Jeff Brown
65d8433f7b am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 
* commit '2e21bdbe303a8abba406bdb5469944419e3a698a':
  Ensure MediaRouter correctly handles renamed Wifi displays.
 2012-10-11 14:58:44 -07:00
Jeff Brown
35499475d2 am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 
* commit '17026864e846630da7b619b55c5a65311484656c':
  Ensure Binder in-calls to UiModeManagerService are guarded.
 2012-10-11 14:57:05 -07:00
Winson Chung
4cce397c0d Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev 2012-10-11 14:56:56 -07:00
Jeff Brown
2e21bdbe30 Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev 2012-10-11 14:56:56 -07:00
Jeff Brown
17026864e8 Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev 2012-10-11 14:53:54 -07:00
Craig Mautner
a37994b2b4 am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev 
* commit '46fb9e9f226c234c2b95428b8827df3cb0333cde':
  Check for apps closing and restore mExiting test.
 2012-10-11 14:52:15 -07:00