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

57626 Commits

Author SHA1 Message Date
Vineeta Srivastava
7c90b84ba4 am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'bc067325de8197a38feec3782a64e02023c9170d':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-11 17:51:41 +00:00
Vineeta Srivastava
e14a29ff3d Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 2014-09-11 17:41:02 +00:00
Matthew Williams
b82118fa1f am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
  Add flag to JobParameters for job expired
 2014-09-11 17:40:11 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Amith Yamasani
d12c36d7b6 am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
  Apply cross-user restrictions to Shell
 2014-09-11 16:53:56 +00:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call 
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
 2014-09-11 09:49:45 -07:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
ztenghui
987c7e0967 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:44:17 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
Alexandra Gherghina
fd913eca07 am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:22:14 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
7dddf9fc11 am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
  Replace TreeSet with HashSet.
 2014-09-11 16:06:16 +00:00
George Mount
70c2c0e7b1 am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:06:11 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet. 
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
 2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
5da068b027 am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 15:53:21 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Yohei Yukawa
a0466b6ffb am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 
* commit '293e50073ab11b2cdb16aac5d9df561dc87bbdf5':
  Enrich test cases when enabling default IMEs part 3
 2014-09-11 15:38:52 +00:00
Yohei Yukawa
e5fe4bc96d Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 2014-09-11 15:32:16 +00:00
Baligh Uddin
ef9517f019 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:31 +00:00
Alexandra Gherghina
f44d8d72c1 am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
  Remove package level intent forwarding.
 2014-09-11 15:24:44 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Yohei Yukawa
d77adfe52d Enrich test cases when enabling default IMEs part 3 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- A dummy Hinglish IME ("en_US" + "hi") is added
- Added test cases where system locale is "en_GB",
  "en_IN", and "hi" as well as "en_US".

BUG: 17347871
Change-Id: Iacf0f47c4dbc147f8153df50ba58fc4da4dacd29
 2014-09-12 00:07:41 +09:00
Yohei Yukawa
1ce85f0693 am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 
* commit '163c3d9aa2e15c8e7d5415ce927362a7bc752d85':
  Enrich test cases when enabling default IMEs part 2
 2014-09-11 14:59:50 +00:00
Yohei Yukawa
91f49ed13c Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 2014-09-11 14:50:01 +00:00
Yohei Yukawa
bca817b2e2 Enrich test cases when enabling default IMEs part 2 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isSystemReady == false is now coverted.
- tests can run even when the system locale of test
  environment is different from "en_US"

BUG: 17347871

Change-Id: I9434270735d3b37d8b788d41250b23d7950aaeed
 2014-09-11 23:44:43 +09:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Paul Jensen
8f776b0c0f am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit 'c1dad5c2e953535f61a6438a13cee40088786d58':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 13:23:31 +00:00
Paul Jensen
204dc65f37 Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 2014-09-11 13:15:22 +00:00
Paul Jensen
c5297d2030 am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '7f1343eec6a94092236044381b92d8085605ee4f':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 13:08:24 +00:00
Paul Jensen
5236971bbf Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 2014-09-11 12:57:33 +00:00
Jorim Jaggi
68a7bd4933 am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit '7a09459352d0f37380d2552b8a90834c4073fa63':
  Fix inconsistent layout param in notification
 2014-09-11 12:47:05 +00:00
Jorim Jaggi
0cf327daf3 Merge "Fix inconsistent layout param in notification" into lmp-dev 2014-09-11 12:40:04 +00:00
Yohei Yukawa
dc28895d01 am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev 
* commit '92701395cfcc883683bcaf023d7b97782e5127e8':
  Enrich test cases when enabling default IMEs
 2014-09-11 07:01:46 +00:00
Yohei Yukawa
726f2fe3c9 Merge "Enrich test cases when enabling default IMEs" into lmp-dev 2014-09-11 06:53:48 +00:00
Yohei Yukawa
cfcbddaff2 Enrich test cases when enabling default IMEs 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isAsciiCapable is now annotated accordingly.
- "dummy.keyboard0" now has several subtypes like
  "en_GB", "en_IN", "hi", "hi_ZZ" like the AOSP
  LatinIME.

BUG: 17347871
Change-Id: Ide698ed11c2539ba5862e6b37ea63ed19f8ce566
 2014-09-11 11:15:18 +09:00
Alan Viverette
a36b7c236e am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 01:38:54 +00:00
Svetoslav Ganov
f11a7097ad am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
  Using the correct package name for ContentResolver
 2014-09-11 01:38:49 +00:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
f7ac65f353 am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 
* commit '022cfcda265079cc694079db43bd58efcbd4958a':
  Fix issue #17414533: update batterystats occasionally takes a couple...
 2014-09-11 01:04:09 +00:00
Dianne Hackborn
d1006c346b am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 01:04:02 +00:00
Lajos Molnar
eaaef6c0bf am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
  add android.util.SizeF.parseSizeF()
 2014-09-11 01:03:51 +00:00
Dianne Hackborn
023b6812ab Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 2014-09-11 00:56:41 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Matthew Williams
03a4da6e8e Add flag to JobParameters for job expired 
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
 2014-09-10 17:32:18 -07:00
Paul Jensen
07ed07459a Make Network.openConnection() share HttpHandlers not OkHttpClients. 
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.

bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa
 2014-09-11 00:25:50 +00:00
Amith Yamasani
8cd28b57ed Apply cross-user restrictions to Shell 
Even though Shell user is allowed to perform cross-user actions,
lock that path down if the target user has restrictions imposed by
the profile owner device admin that prevents access via adb.

If the profile owner has imposed DISALLOW_DEBUGGING_FEATURES, don't
allow the shell user to make the following types of calls:
start activities, make service calls, access content providers,
send broadcasts, block/unblock packages, clear user data, etc.

Bug: 15086577
Change-Id: I9669fc165953076f786ed51cbc17d20d6fa995c3
 2014-09-10 17:15:06 -07:00