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

105146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
e60bcc63e5 Tracking change to add AEAD functionality 
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9

Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
 2013-05-14 17:54:07 -07:00
Christopher Tate
f057153980 am f95fdc97: Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev 
* commit 'f95fdc9754eea76066905424044b7c6d43c60c2d':
  Maintain restrictions when downgrading system apps
 2013-05-14 17:18:15 -07:00
Christopher Tate
f95fdc9754 Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev 2013-05-15 00:14:06 +00:00
Zhentao Sun
0412f5b116 am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev 
* commit '5f8afdd8ec168a7e5e5ca8203419a40f069a9351':
  Passed the correct gps geofence availability value to client.
 2013-05-14 16:53:42 -07:00
Zhentao Sun
5f8afdd8ec Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev 2013-05-14 23:51:16 +00:00
Christopher Tate
acee6e9121 Maintain restrictions when downgrading system apps 
When an upgraded system-bundled app is reverted to the factory
version, we now maintain restricted profiles' access policies
w.r.t. that app.

Bug 8905395

Change-Id: I3f230ac3f70a77fb14c0180b44c9b42fc49250a2
 2013-05-14 16:47:07 -07:00
Matthew Xie
b82fc420f3 am f270fc3b: Merge "cannot turn on bluetooth" into jb-mr2-dev 
* commit 'f270fc3b5014e39614f7e6499cd6aa4ea18e8616':
  cannot turn on bluetooth
 2013-05-14 16:21:30 -07:00
Matthew Xie
f270fc3b50 Merge "cannot turn on bluetooth" into jb-mr2-dev 2013-05-14 23:18:04 +00:00
Joe Fernandez
95f6c758ae Search tag additions 
Adding more search tags for feature areas (tools, adk, gcm, etc.)

Change-Id: I34b9b6e220b19f6adaf532e39eebb0d30b1573c7
 2013-05-14 16:10:58 -07:00
Zhentao Sun
b8061be81c Passed the correct gps geofence availability value to client. 
Fixed b/8967427.

Change-Id: If205b963533f096c27985476a5d487a2d090ccf8
 2013-05-14 15:34:15 -07:00
Amith Yamasani
ce2b6f9654 Opt-in Settings package to see restricted accounts 
This can't be done in the settings package because the API only allows one account type
to be listed. This resource gives the Settings app blanket access to restricted accounts
when running in a restricted profile.

Bug: 8968575
Change-Id: I69b42b496d9cf235982d40a142c084295edc6281
 2013-05-14 15:10:19 -07:00
Raph Levien
01524651cb Fix for bug 8911390 RTL text alignment is changed ... 
The predicate for detecting whether text was right aligned was missing
some cases - it was correctly sensing RIGHT or OPPOSITE aligned text
in the LTR case, but was missing NORMAL for rtl. This patch just adds
that case.

Change-Id: I06691e7122e1ca91d66299cf0d7ef1f8a476a44b
 2013-05-14 14:00:07 -07:00
Glenn Kasten
10d69f556f am 7c6ebac7: am b1199209: am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit '7c6ebac75dd75382dbc71e8a5ca943d29266af06':
  A/V sync and latency PCB
 2013-05-14 12:58:18 -07:00
The Android Automerger
540fd9df3b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-14 12:58:06 -07:00
Glenn Kasten
7c6ebac75d am b1199209: am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit 'b1199209adbdf62d0ba1f48815925c15ed17d120':
  A/V sync and latency PCB
 2013-05-14 12:56:18 -07:00
Glenn Kasten
b1199209ad am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit '702543f3e1b9e3fdaa379663e8e79d532ad6edd8':
  A/V sync and latency PCB
 2013-05-14 12:53:49 -07:00
Glenn Kasten
702543f3e1 am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit 'c0f462c9b5fb5288e78c9a676e8b86525646d522':
  A/V sync and latency PCB
 2013-05-14 12:51:32 -07:00
Glenn Kasten
c0f462c9b5 am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit '86593304c7733fff6308543e2359573435376def':
  A/V sync and latency PCB
 2013-05-14 12:49:44 -07:00
Glenn Kasten
86593304c7 am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs 
* commit '068e2315ff61d2aadd8ee78b25deeef27084dc64':
  A/V sync and latency PCB
 2013-05-14 12:48:13 -07:00
Glenn Kasten
068e2315ff Merge "A/V sync and latency PCB" into jb-mr1.1-docs 2013-05-14 19:45:36 +00:00
Elliott Hughes
4d86196ff2 am b37652a2: Merge "Track libcore API changes." 
* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
  Track libcore API changes.
 2013-05-14 11:45:38 -07:00
kmccormick
69f8d654cb am 15715588: am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit '157155887c0684170ef0c64179ce94cdfe257972':
  Doc update: CCS and notifications
 2013-05-14 11:40:50 -07:00
Elliott Hughes
b37652a297 Merge "Track libcore API changes." 2013-05-14 18:38:42 +00:00
kmccormick
157155887c am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit 'c9c33d9373d9781dd21e449493e66de127c2d87a':
  Doc update: CCS and notifications
 2013-05-14 11:35:59 -07:00
Dirk Dougherty
22f1207462 am d01558cb: am 6078beaa: am d322783e: am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit 'd01558cb96ff80721ca22510494072f9b5188708':
  Doc change: Add localization checklist.
 2013-05-14 11:33:54 -07:00
Dirk Dougherty
667153fb77 am c5478d50: am 8719fd07: am 9d59115b: am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit 'c5478d504d37058c673f193605b65be7857d69fb':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:33:51 -07:00
Scott Main
40af497913 am 8f4b8062: am ad78d575: am 5644deed: am cbcd17d3: add new notice link from design docs to developer docs 
* commit '8f4b806237f9b4d4644bb7ad09d7d686448ecb7d':
  add new notice link from design docs to developer docs
 2013-05-14 11:33:48 -07:00
kmccormick
c9c33d9373 am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit '19721f9e6fe58814cf8bef213a14503f7eb77f0c':
  Doc update: CCS and notifications
 2013-05-14 11:33:35 -07:00
kmccormick
19721f9e6f am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit '592b822c48498844170dd24d26103336afdaaae6':
  Doc update: CCS and notifications
 2013-05-14 11:32:12 -07:00
Dirk Dougherty
d01558cb96 am 6078beaa: am d322783e: am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit '6078beaae94e1cbb369d0c254106898a689e4968':
  Doc change: Add localization checklist.
 2013-05-14 11:32:06 -07:00
Dirk Dougherty
c5478d504d am 8719fd07: am 9d59115b: am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit '8719fd079c0852cc8fcf8aa824e381d2d0843d66':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:32:03 -07:00
Scott Main
8f4b806237 am ad78d575: am 5644deed: am cbcd17d3: add new notice link from design docs to developer docs 
* commit 'ad78d575815d7af55ec66cdc06f190a6ae070399':
  add new notice link from design docs to developer docs
 2013-05-14 11:31:59 -07:00
kmccormick
592b822c48 am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit '6e5dc4dde8ed020759bb4c0fa50d92cb889d7882':
  Doc update: CCS and notifications
 2013-05-14 11:29:53 -07:00
kmccormick
cca053a389 am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 
* commit '3722947f2f22b9b56a7479bd29af2680e608f674':
  Doc update: manual merge of changes from jb-mr1.1
 2013-05-14 11:29:16 -07:00
kmccormick
6e5dc4dde8 am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 
* commit '0bf8c6f9264337450f9ba1d6e66888e527dd6164':
  Doc update: CCS and notifications
 2013-05-14 11:27:34 -07:00
kmccormick
3722947f2f Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev 2013-05-14 18:26:38 +00:00
kmccormick
0bf8c6f926 Merge "Doc update: CCS and notifications" into jb-mr1.1-docs 2013-05-14 18:25:41 +00:00
Dirk Dougherty
6078beaae9 am d322783e: am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit 'd322783e75647c25857bab9bca22c4dee62d7bc7':
  Doc change: Add localization checklist.
 2013-05-14 11:14:47 -07:00
Dirk Dougherty
8719fd079c am 9d59115b: am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit '9d59115b0eda4bdc9093d2f282df613afa67bd34':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:14:44 -07:00
Dirk Dougherty
d322783e75 am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit 'd9938ed36c60df56d00414bc201fa31ebb1e9d7b':
  Doc change: Add localization checklist.
 2013-05-14 11:11:40 -07:00
Dirk Dougherty
9d59115b0e am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit '42a039cd4811f21fef0c19f1e6648e5a796a262e':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:11:38 -07:00
Scott Main
ad78d57581 am 5644deed: am cbcd17d3: add new notice link from design docs to developer docs 
* commit '5644deed80bf13351482b25a27dcf21b8a419eeb':
  add new notice link from design docs to developer docs
 2013-05-14 11:11:14 -07:00
Scott Main
5644deed80 am cbcd17d3: add new notice link from design docs to developer docs 
* commit 'cbcd17d352a73419d39af798d1e40977c4422ae3':
  add new notice link from design docs to developer docs
 2013-05-14 11:08:16 -07:00
Dirk Dougherty
d9938ed36c am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit '373fb7493415836883e86e7a494cc3eb63aaad64':
  Doc change: Add localization checklist.
 2013-05-14 11:08:05 -07:00
Dirk Dougherty
42a039cd48 am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit 'd1ebc63945b06de2ba12d9675521eda234068a13':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:08:03 -07:00
Svetoslav
80127981f8 am c0a979ce: Merge "Fixing the accessibility text traversal in extend mode." into jb-mr2-dev 
* commit 'c0a979ce30cf9b96c0a84d0679aeeef7153a22fa':
  Fixing the accessibility text traversal in extend mode.
 2013-05-14 11:07:08 -07:00
Matthew Xie
389bf4b331 am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev 
* commit '4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9':
  Use the right fd for flush call
 2013-05-14 11:07:06 -07:00
Dirk Dougherty
373fb74934 am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs 
* commit '70b0728b78e68a5d12c68501dfede719dfa1ed88':
  Doc change: Add localization checklist.
 2013-05-14 11:05:42 -07:00
Dirk Dougherty
d1ebc63945 am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs 
* commit '53559d0b50dcde778ff7630c344dd1c07beef96d':
  Doc change: Clean refresh of gms reference to remove unused.
 2013-05-14 11:05:38 -07:00
Elliott Hughes
a377b42109 Track libcore API changes. 
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
 2013-05-14 10:55:52 -07:00